mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-10 08:52:40 -07:00
Code Issues Projects Releases Wiki Activity
68570 commits 248 branches 194 tags 1 GiB
Commit graph

394 commits

Author SHA1 Message Date
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
Miles Bader
fe682fb2f0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 239-258)

   - Update from CVS
   - (Ffield_beginning, find_field): Undo change of 2006-04-23.
   - Rcirc patch from Ryan Yeske
   - Merge from gnus--rel--5.10
   - Clean up lisp/gnus/ChangeLog a bit

 * gnus--rel--5.10  (patch 91-98)

   - Merge from emacs--devo--0
   - Update from CVS
 2006-05-02 05:51:52 +00:00
Richard M. Stallman
9abc5f4519 (Fdefine_key): Improve error message when KEY begins with a non-prefix key. 2006-04-30 22:15:21 +00:00
Stefan Monnier
e89e07ccac (store_in_keymap): Change def' arg to not be register'. 
Seems to trigger a bug in gcc-amd64 4.0.2 20051125 (Red Hat 4.0.2-8):
keymap.c:895: error: address of register variable `def' requested.
 2006-04-26 20:50:25 +00:00
Miles Bader
7e635d0ed3 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-57 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 226-238)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.

 * gnus--rel--5.10  (patch 86-90)

   - Update from CVS
   - Merge from emacs--devo--0
 2006-04-21 05:39:14 +00:00
Richard M. Stallman
5615dcc03b (describe_map): Make "shadowed" warning more verbose. 2006-04-18 20:58:59 +00:00
Miles Bader
49d395cd57 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-54 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 190-203)

   - Update from CVS
   - Undo incorrect merge of etc/images/README from Gnus 5.10
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 74-80)

   - Update from CVS
   - Update from CVS: README: Addition from 5.10.6 tar ball.
 2006-04-09 00:38:22 +00:00
Stefan Monnier
15fdcac722 (describe_map): Don't use XINT if we haven't checked INTEGERP. 2006-04-08 14:20:10 +00:00
Miles Bader
1ef7e5599f Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 164-184)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: man/mh-e.texi (Folders): Various edits.
   - Update from erc--emacs--0

 * gnus--rel--5.10  (patch 62-70)

   - Merge from emacs--devo--0
   - Update from CVS
 2006-03-28 23:08:20 +00:00
Kenichi Handa
d89b5760af (map_keymap): Set tail to Qnil before GCPRO it. 2006-03-20 06:24:31 +00:00
Miles Bader
71936d6753 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-43 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 148-156)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Remove nick-abbrevs stuff from rcirc.el
   - rcirc.el update from Ryan Yeske

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

   - Copy/update icons from Gnus trunk
 2006-03-13 12:19:58 +00:00
Richard M. Stallman
7857982c9f (describe_map): Shorten string to indicate shadowed binding. 2006-03-11 15:25:03 +00:00
Miles Bader
0b12547529 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-14 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 58-65)

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

 * gnus--rel--5.10  (patch 22-28)

   - Update from CVS
   - Merge from emacs--devo--0
   - Update from CVS: lisp/gnus.el: Remove bogus comment.
 2006-02-11 00:11:19 +00:00
Kim F. Storm
a7f96a358b * data.c (Findirect_function): Add NOERROR arg. All callers changed 
to pass Qnil for NOERROR.

* keymap.c (current_minor_maps_error): Remove.
(current_minor_maps): Pass Qt for NOERROR to Findirect_function
instead of using internal_condition_case_1+current_minor_maps_error.
 2006-02-10 00:00:31 +00:00
Miles Bader
380874900c Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 43-57)

   - Update from CVS
   - Merge from erc--emacs--0
   - Make constrain-to-field notice overlays
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 18-21)

   - Update from CVS
   - Merge from emacs--devo--0
 2006-02-08 04:26:44 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Miles Bader
06eb776d8e Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-9 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 16-33)

   - Update from CVS
   - Install ERC.
   - Fix ERC compiler warnings.
   - Use utf-8 encoding in ERC ChangeLogs.
   - Merge ERC-related Viper hacks into Viper.
   - Merge from erc--main--0
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 8-13)

   - Merge from emacs--devo--0
   - Update from CVS
 2006-02-01 10:07:17 +00:00
Richard M. Stallman
bb9c8a997a (Fmap_keymap): Doc fix. 2006-01-26 17:50:50 +00:00
Miles Bader
b2ba4dcba1 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-7 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 4-14)

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

 * gnus--rel--5.10  (base, patch 1-7)

   - tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
   - Update from CVS
   - Merge from emacs--devo--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 187)

   - Update from CVS
 2006-01-25 07:10:04 +00:00
Richard M. Stallman
05f5847bd2 (Fmap_keymap): Doc fix. 2006-01-19 17:41:40 +00:00
Miles Bader
41882805d6 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97 
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 616-696)

   - Add lisp/mh-e/.arch-inventory
   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
   - lisp/gnus/ChangeLog: Remove duplicate entry

 * gnus--rel--5.10  (patch 147-181)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: lisp/mml.el (mml-preview): Doc fix.
   - Update from CVS: texi/message.texi: Fix default values.
   - Update from CVS: texi/gnus.texi (RSS): Addition.
 2006-01-16 08:37:27 +00:00
Stefan Monnier
ccf0250b2f (describe_map_compare): Yet another int/Lisp_Object mixup. 2006-01-03 16:54:47 +00:00
Richard M. Stallman
c36238ee75 (describe_map): Put sparse map elements into an array, 
sort them, then output a sequence of identical bindings on one line.
(struct describe_map_elt): New data type.
(describe_map_compare): New function.
 2005-12-30 04:52:32 +00:00
Stefan Monnier
addcdb7c89 (Vfunction_key_map): Docstring fix: mention that bindings can be functions. 2005-12-19 15:46:13 +00:00
Richard M. Stallman
49daa5b162 (Fset_keymap_parent, store_in_keymap): Use CHECK_IMPURE. 
(Flookup_key): Doc fix.
(syms_of_keymap) <function-key-map>: Doc fix.
 2005-12-11 15:35:14 +00:00
Eli Zaretskii
3d866cebd2 (Vminibuffer_local_filename_completion_map) 
(Vminibuffer_local_must_match_filename_map): New variables.
(syms_of_keymap): DEFVAR_LISP them, initialize them, and set their parent to
be Vminibuffer_local_completion_map and Vminibuffer_local_must_match_map,
respectively.
 2005-12-02 13:47:11 +00:00