mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-21 15:40:59 -08:00
Code Issues Projects Releases Wiki Activity
73835 commits 245 branches 194 tags 1,006 MiB
Commit graph

419 commits

Author SHA1 Message Date
Miles Bader
1011c48763 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 803-805)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227
 2007-07-09 08:00:55 +00:00
David Kastrup
9a51747bac * keymaps.texi (Active Keymaps): Document new POSITION argument of 
`current-active-maps'.

* keymap.c (Fcurrent_active_maps): Add `position' argument.
(Fwhere_is_internal): Adjust call to `current-active-maps' to
cater for additional parameter.

* keymap.h: Adjust number of parameters to `current-active-maps'.

* doc.c (Fsubstitute_command_keys): Adjust call of
`current-active-maps'.
 2007-06-25 20:53:48 +00:00
Miles Bader
fb9a13e3dc Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 781-792)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 33-41)
 * gnus--rel--5.10  (patch 226-228)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-219
 2007-06-11 00:58:11 +00:00
Juanma Barranquero
de47a796fe (Fkey_description): Use empty_unibyte_string. 2007-06-08 20:10:01 +00:00
Miles Bader
4ace64cc90 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 726-750)

   - Update from CVS
   - Merge from emacs--rel--22
   - Merge from gnus--rel--5.10

 * emacs--rel--22  (patch 6-17)

   - Update from CVS
   - Update from CVS: src/xterm.c (XTread_socket): Revert last change.

 * gnus--rel--5.10  (patch 218-221)

   - Merge from emacs--devo--0, emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-205
 2007-05-15 07:17:13 +00:00
Andreas Schwab
d6d8548d54 (Flookup_key): Fix typo in last change. 2007-05-07 20:50:08 +00:00
Stefan Monnier
5df3999833 (Fdefine_key, Flookup_key): Only do the 0x80->meta_modifier 
mapping for unibyte strings.
 2007-05-07 15:41:37 +00:00
Miles Bader
991a760232 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 698-710)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 216)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196
 2007-04-24 21:56:25 +00:00
Richard M. Stallman
00b7c149fe (Fdefine_key): Minor doc fix. 2007-04-22 16:53:57 +00:00
Glenn Morris
01681a4152 (Fdefine_key): Fix info ref in doc string. 2007-04-21 19:29:26 +00:00
Miles Bader
57cb2e6f26 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 675-697)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Release ERC 5.2.

 * gnus--rel--5.10  (patch 211-215)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
 2007-04-11 00:17:47 +00:00
Chong Yidong
55665fe72a (Fcommand_remapping): New optional argument. 
(where_is_internal): Use new keymaps argument.
(Fkey_binding): Caller changed.
 2007-04-01 22:03:22 +00:00
Chong Yidong
bee27b4de3 (where_is_internal): Scan provided keymaps for command remappings 
rather than calling Fcommand_remapping.
 2007-04-01 15:58:29 +00:00
Eli Zaretskii
f6f11d1ca3 Fix a comment before `current_minor_maps'. 2007-03-24 16:23:01 +00:00
Miles Bader
a72ea5f5b0 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 662-669)

   - Update from CVS
   - Fix read-only prompt problem in isearch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 207-208)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-184
 2007-03-18 14:11:08 +00:00
Juanma Barranquero
2fa7d369ba (Fdescribe_buffer_bindings): Check that BUFFER is valid. 2007-03-09 17:31:12 +00:00
Miles Bader
70fff7b100 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 653-661)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 203-206)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-180
 2007-03-04 06:19:40 +00:00
David Kastrup
b9b263874c *** empty log message *** 2007-03-02 08:45:13 +00:00
Miles Bader
c0466914ba Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
 2007-01-26 06:16:11 +00:00
Kim F. Storm
0af1451662 (describe_map): Don't consider prefix keys to be shadowed. 2007-01-24 00:26:30 +00:00
Glenn Morris
4e6835dbc4 Add 2007 to copyright years. 2007-01-21 04:57:37 +00:00
Miles Bader
4c34eeeee5 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 563-582)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 177-185)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
 2007-01-01 03:21:06 +00:00
Richard M. Stallman
b23916e76b (Fdefine_key): Doc fix. 2006-12-30 06:25:06 +00:00
Miles Bader
4bc5d7668e Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 545-562)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - erc-iswitchb: Temporarily enable iswitchb mode

 * gnus--rel--5.10  (patch 172-176)

   - Merge from emacs--devo--0
   - Update from CVS
   - Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
 2006-12-16 01:29:26 +00:00
Juanma Barranquero
64b2caa5fe (Flookup_key): Doc fix. 2006-12-10 23:33:46 +00:00
Miles Bader
bb9c4b4f8b Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 460-475)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 145-152)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-118
 2006-10-15 02:54:13 +00:00
Chong Yidong
eae637ecd3 * keymap.c (Fkey_binding): Check Lisp_Object types before doing 
XCAR and XINT.
 2006-10-13 01:45:37 +00:00
Miles Bader
f3bbbd1145 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 447-459)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 141-144)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-115
 2006-10-03 05:04:21 +00:00
Stefan Monnier
7ae8428d90 (Fdefine_key): Yet another int/Lisp_Object mixup (YAILOM). 2006-09-28 19:00:10 +00:00
Kenichi Handa
4ccaff6744 (Fsingle_key_description): For an invalid char, retuen 
"Invalid char code NNNNN".
 2006-09-26 04:17:41 +00:00
Kenichi Handa
8bb3035f33 (Fsingle_key_description): Fix the last change. 2006-09-25 04:38:18 +00:00
Kenichi Handa
173517c6c1 (Fsingle_key_description): Return unique names for 
generic characters.
 2006-09-25 02:52:03 +00:00
Kenichi Handa
b50685893e (Fmap_keymap): Docstring mentions about generic 
character.
 2006-09-23 05:37:18 +00:00
Miles Bader
465384748f Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 437-446)

   - Update from CVS
   - lisp/url/url-methods.el: Fix format error when http_proxy is empty string
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 137-140)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-111
 2006-09-20 06:04:23 +00:00
Stefan Monnier
08e26e8bfa Include alloca.h if available. 
(Fkey_binding): Only use AREF after checking it's a vector.
Remove unused var `window'.
 2006-09-19 10:19:34 +00:00
David Kastrup
b74e16a384 * NEWS: explain new behavior and arguments of `key-binding' and 
`command-remapping'.

* keymaps.texi (Active Keymaps): Adapt description to use
`get-char-property' instead `get-text-property'.  Explain how
mouse events change this.  Explain the new optional argument of
`key-binding' and its mouse-dependent lookup.
(Searching Keymaps): Adapt description similarly.  Explain the new
optional argument of `command-remapping'.

* Makefile.in (keymap.o): Add "keymap.h" and "window.h"
dependencies.

* keymap.c: include "window.h".
(Fcommand_remapping): New optional POSITION argument.
(Fkey_binding): New optional POSITION argument.  Completely rework
handling of mouse clicks to get the same order of keymaps as
`read-key-sequence' and heed POSITION.  Also temporarily switch
buffers to location of mouse click and back.

* keyboard.c (command_loop_1): Adjust call of `Fcommand_remapping'
for additional argument.
(parse_menu_item): Adjust call of `Fkey_binding' for additional
argument.
(read_key_sequence): If there are both `local-map' and `keymap'
text properties at some buffer position, heed both.

* keymap.h: Declare additional optional arguments of
`Fcommand_remapping' and `Fkey_binding'.
 2006-09-15 07:19:15 +00:00
Miles Bader
863153c57b Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 427-436)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 134-136)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-110
 2006-09-14 09:24:00 +00:00
Chong Yidong
91197db4cb * keymap.c (Fkey_binding): Use string position for string objects. 2006-09-11 13:03:40 +00:00
Kim F. Storm
4d32309c14 (Fkey_binding): Fix last change. 2006-09-11 08:52:42 +00:00
Chong Yidong
b067ddb637 * keymap.c (Fkey_binding): Check for local keymap for mouse click 
events.
 2006-09-11 02:34:05 +00:00
Miles Bader
e2b9706014 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 357-381)

   - Merge from gnus--rel--5.10
   - Update from CVS
   - Merge from erc--emacs--21

 * gnus--rel--5.10  (patch 116-122)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-98
 2006-08-03 11:45:23 +00:00
Stefan Monnier
2db8f17387 (Fdefine_key): If the key binding definition looks like an 
XEmacs-style key sequence, convert it to Emacs's format.
 2006-07-22 21:22:52 +00:00
Miles Bader
63db3c1b3f Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 343-356)

   - Update from CVS
   - Update for ERC 5.1.3.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 113-115)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90
 2006-07-19 00:42:56 +00:00
Kim F. Storm
fb53f3543b (Fmap_keymap): Use xsignal1. 2006-07-18 13:28:21 +00:00
Kim F. Storm
ce5a29a111 (Fdefine_key, Flookup_key): Use CHECK_VECTOR_OR_STRING. 2006-07-12 13:19:15 +00:00
Kenichi Handa
f0c4d038a9 (push_key_description): Fix synching with HEAD. 2006-05-15 02:45:29 +00:00
Miles Bader
3bcf2b084a Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-60 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 259-273)

   - Update from CVS
   - lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t
   - Merge from gnus--rel--5.10
   - Rename "field-at-point" to "field-at-pos"
   - (comint-insert-input): Remove redundant calls to setq and goto-char

 * gnus--rel--5.10  (patch 99-100)

   - Merge from emacs--devo--0
   - Update from CVS
 2006-05-10 20:42:41 +00:00
Chong Yidong
d3ee989e85 * keymap.c (describe_map): Avoid generating duplicate entries if 
the shadowed binding has the same definition.
 2006-05-10 03:32:06 +00:00
Kenichi Handa
5f2c7b2a65 (push_key_description): Fix previous change. 2006-05-09 13:20:25 +00:00
Kenichi Handa
f39a0b4301 (push_key_description): Handle invalid character key. 2006-05-09 13:17:24 +00:00