From 2515a13130407aaad6ff3c25ab6e013fec042ac8 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sat, 7 Aug 2004 02:32:11 +0000 Subject: (syms_of_keyboard) : Doc fix. --- src/ChangeLog | 5 +++++ src/keyboard.c | 1 + 2 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 2b0c47862d4..285f9162a75 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-08-06 Luc Teirlinck + + * keyboard.c (syms_of_keyboard) : + Doc fix. + 2004-08-03 Kenichi Handa * coding.c (decode_coding_string): Adjust coding->consumed, and diff --git a/src/keyboard.c b/src/keyboard.c index 07b91d16040..55802e7d30a 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -11280,6 +11280,7 @@ The elements of the list are event types that may have menu bar bindings. */); doc: /* Per-terminal keymap that overrides all other local keymaps. If this variable is non-nil, it is used as a keymap instead of the buffer's local map, and the minor mode keymaps and text property keymaps. +It also overrides `overriding-local-map'. This variable is intended to let commands such as `universal-argument' set up a different keymap for reading the next command. */); -- cgit v1.2.1 From 0cedd530e32404ca05c7535d373fc64acd29e784 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 7 Aug 2004 20:57:19 +0000 Subject: (make_temp_name): Handle multibyte prefixes. --- src/ChangeLog | 4 ++++ src/fileio.c | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 285f9162a75..1f4952b2ea1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-08-07 Stefan Monnier + + * fileio.c (make_temp_name): Handle multibyte prefixes. + 2004-08-06 Luc Teirlinck * keyboard.c (syms_of_keyboard) : diff --git a/src/fileio.c b/src/fileio.c index c417dcdf339..a05b1cb8340 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -886,7 +886,7 @@ make_temp_name (prefix, base64_p) int base64_p; { Lisp_Object val; - int len; + int len, clen; int pid; unsigned char *p, *data; char pidbuf[20]; @@ -921,8 +921,10 @@ make_temp_name (prefix, base64_p) #endif } - len = SCHARS (prefix); - val = make_uninit_string (len + 3 + pidlen); + len = SBYTES (prefix); clen = SCHARS (prefix); + val = make_uninit_multibyte_string (clen + 3 + pidlen, len + 3 + pidlen); + if (!STRING_MULTIBYTE (prefix)) + STRING_SET_UNIBYTE (val); data = SDATA (val); bcopy(SDATA (prefix), data, len); p = data + len; -- cgit v1.2.1 From 1725a7c935d4d381d0bb1216b75e3ac786fcad49 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 7 Aug 2004 21:07:57 +0000 Subject: (window_list_1): YAILOM. --- src/ChangeLog | 2 ++ src/window.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 1f4952b2ea1..4b4246d6070 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2004-08-07 Stefan Monnier + * window.c (window_list_1): YAILOM. + * fileio.c (make_temp_name): Handle multibyte prefixes. 2004-08-06 Luc Teirlinck diff --git a/src/window.c b/src/window.c index ad22e1df107..463c8f1f1bd 100644 --- a/src/window.c +++ b/src/window.c @@ -1828,7 +1828,7 @@ window_list_1 (window, minibuf, all_frames) rest = Fmemq (window, list); if (!NILP (rest) && !EQ (rest, list)) { - for (tail = list; XCDR (tail) != rest; tail = XCDR (tail)) + for (tail = list; !EQ (XCDR (tail), rest); tail = XCDR (tail)) ; XSETCDR (tail, Qnil); list = nconc2 (rest, list); -- cgit v1.2.1 From 7a093e872021135087ca04364bf1764832fc807a Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sun, 8 Aug 2004 00:33:40 +0000 Subject: (Flocal_key_binding, Fglobal_key_binding) (syms_of_keymap) : Doc fixes. --- src/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/keymap.c b/src/keymap.c index 6cb7b8709d3..3d4a782b5f8 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1602,7 +1602,7 @@ is non-nil, `key-binding' returns the unmapped command. */) DEFUN ("local-key-binding", Flocal_key_binding, Slocal_key_binding, 1, 2, 0, doc: /* Return the binding for command KEYS in current local keymap only. -KEYS is a string, a sequence of keystrokes. +KEYS is a string or vector, a sequence of keystrokes. The binding is probably a symbol with a function definition. If optional argument ACCEPT-DEFAULT is non-nil, recognize default @@ -1621,7 +1621,7 @@ bindings; see the description of `lookup-key' for more details about this. */) DEFUN ("global-key-binding", Fglobal_key_binding, Sglobal_key_binding, 1, 2, 0, doc: /* Return the binding for command KEYS in current global keymap only. -KEYS is a string, a sequence of keystrokes. +KEYS is a string or vector, a sequence of keystrokes. The binding is probably a symbol with a function definition. This function's return values are the same as those of `lookup-key' \(which see). @@ -3751,7 +3751,7 @@ key, typing `ESC O P x' would return [f1 x]. */); DEFVAR_LISP ("key-translation-map", &Vkey_translation_map, doc: /* Keymap of key translations that can override keymaps. This keymap works like `function-key-map', but comes after that, -and applies even for keys that have ordinary bindings. */); +and its non-prefix bindings override ordinary bindings. */); Vkey_translation_map = Qnil; staticpro (&Vmouse_events); -- cgit v1.2.1 From 81909a1aef80ec199c646f488da81fa48d1417af Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sun, 8 Aug 2004 00:37:38 +0000 Subject: *** empty log message *** --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 4b4246d6070..577f3291069 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-08-07 Luc Teirlinck + + * keymap.c (Flocal_key_binding, Fglobal_key_binding) + (syms_of_keymap) : Doc fixes. + 2004-08-07 Stefan Monnier * window.c (window_list_1): YAILOM. -- cgit v1.2.1 From 971e4c987c646d7654232c72990ff5554a0023b9 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sun, 8 Aug 2004 16:17:23 +0000 Subject: Declare Qdisabled_command_function instead of Qdisabled_command_hook. (Fcommand_execute): Use Qdisabled_command_function instead of Qdisabled_command_hook. (syms_of_keyboard): Ditto. --- src/keyboard.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/keyboard.c b/src/keyboard.c index 55802e7d30a..268d782e478 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -131,8 +131,8 @@ KBOARD the_only_kboard; #endif /* Non-nil disable property on a command means - do not execute it; call disabled-command-hook's value instead. */ -Lisp_Object Qdisabled, Qdisabled_command_hook; + do not execute it; call disabled-command-function's value instead. */ +Lisp_Object Qdisabled, Qdisabled_command_function; #define NUM_RECENT_KEYS (100) int recent_keys_index; /* Index for storing next element into recent_keys */ @@ -9665,9 +9665,9 @@ a special event, so ignore the prefix argument and don't clear it. */) tem = Fget (cmd, Qdisabled); if (!NILP (tem) && !NILP (Vrun_hooks)) { - tem = Fsymbol_value (Qdisabled_command_hook); + tem = Fsymbol_value (Qdisabled_command_function); if (!NILP (tem)) - return call1 (Vrun_hooks, Qdisabled_command_hook); + return call1 (Vrun_hooks, Qdisabled_command_function); } } @@ -10782,8 +10782,8 @@ syms_of_keyboard () Qtimer_event_handler = intern ("timer-event-handler"); staticpro (&Qtimer_event_handler); - Qdisabled_command_hook = intern ("disabled-command-hook"); - staticpro (&Qdisabled_command_hook); + Qdisabled_command_function = intern ("disabled-command-function"); + staticpro (&Qdisabled_command_function); Qself_insert_command = intern ("self-insert-command"); staticpro (&Qself_insert_command); -- cgit v1.2.1 From c90e7e43b102a9732ea4ef7a292f51cec881d463 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sun, 8 Aug 2004 17:09:43 +0000 Subject: *** empty log message *** --- src/ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 577f3291069..7ec9ec257d8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2004-08-08 Luc Teirlinck + + * keyboard.c: Declare Qdisabled_command_function instead of + Qdisabled_command_command. + (Fcommand_execute): Use Qdisabled_command_function instead of + Qdisabled_command_command. + (syms_of_keyboard): Ditto. + 2004-08-07 Luc Teirlinck * keymap.c (Flocal_key_binding, Fglobal_key_binding) -- cgit v1.2.1 From 8392e13818eadb0645893eaf991d9cae429f2e78 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Sun, 8 Aug 2004 17:14:58 +0000 Subject: *** empty log message *** --- src/ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 7ec9ec257d8..248d5daa92e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,9 +1,9 @@ 2004-08-08 Luc Teirlinck * keyboard.c: Declare Qdisabled_command_function instead of - Qdisabled_command_command. + Qdisabled_command_hook. (Fcommand_execute): Use Qdisabled_command_function instead of - Qdisabled_command_command. + Qdisabled_command_hook. (syms_of_keyboard): Ditto. 2004-08-07 Luc Teirlinck -- cgit v1.2.1