aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Fox1993-09-22 18:11:10 +0000
committerBrian Fox1993-09-22 18:11:10 +0000
commit03b4122a294f7130416ab258b047029b5458cf3c (patch)
treeba63e6ed4b5be9a80152c42d2154bfd5e6af82ca /src
parentb95520f5be0a99ed99b0b6edec62b3a8a52d5919 (diff)
downloademacs-03b4122a294f7130416ab258b047029b5458cf3c.tar.gz
emacs-03b4122a294f7130416ab258b047029b5458cf3c.zip
(Qextended_command_history): New variable prevents
sharing of M-x command history with other commands that read values in the minibuffer.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index daf8acd5831..2d712cda8d3 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -402,6 +402,7 @@ extern Lisp_Object Qmenu_enable;
402 402
403Lisp_Object recursive_edit_unwind (), command_loop (); 403Lisp_Object recursive_edit_unwind (), command_loop ();
404Lisp_Object Fthis_command_keys (); 404Lisp_Object Fthis_command_keys ();
405Lisp_Object Qextended_command_history;
405 406
406/* Address (if not 0) of EMACS_TIME to zero out if a SIGIO interrupt 407/* Address (if not 0) of EMACS_TIME to zero out if a SIGIO interrupt
407 happens. */ 408 happens. */
@@ -4548,11 +4549,11 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
4548 4549
4549 /* Prompt with buf, and then read a string, completing from and 4550 /* Prompt with buf, and then read a string, completing from and
4550 restricting to the set of all defined commands. Don't provide 4551 restricting to the set of all defined commands. Don't provide
4551 any initial input. The last Qnil says not to perform a 4552 any initial input. Save the command read on the extended-comman
4552 peculiar hack on the initial input. */ 4553 history list. */
4553 function = Fcompleting_read (build_string (buf), 4554 function = Fcompleting_read (build_string (buf),
4554 Vobarray, Qcommandp, 4555 Vobarray, Qcommandp,
4555 Qt, Qnil, Qnil); 4556 Qt, Qnil, Qextended_command_history);
4556 4557
4557 /* Set this_command_keys to the concatenation of saved_keys and 4558 /* Set this_command_keys to the concatenation of saved_keys and
4558 function, followed by a RET. */ 4559 function, followed by a RET. */
@@ -5214,6 +5215,10 @@ syms_of_keyboard ()
5214 this_command_keys = Fmake_vector (make_number (40), Qnil); 5215 this_command_keys = Fmake_vector (make_number (40), Qnil);
5215 staticpro (&this_command_keys); 5216 staticpro (&this_command_keys);
5216 5217
5218 Qextended_command_history = intern ("extended-command-history");
5219 Fset (Qextended_command_history, Qnil);
5220 staticpro (&Qextended_command_history);
5221
5217 kbd_buffer_frame_or_window 5222 kbd_buffer_frame_or_window
5218 = Fmake_vector (make_number (KBD_BUFFER_SIZE), Qnil); 5223 = Fmake_vector (make_number (KBD_BUFFER_SIZE), Qnil);
5219 staticpro (&kbd_buffer_frame_or_window); 5224 staticpro (&kbd_buffer_frame_or_window);