aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1992-06-05 05:57:46 +0000
committerRichard M. Stallman1992-06-05 05:57:46 +0000
commitc0a58692dac8783c9a4cb153a113f9fb6b72fb8e (patch)
tree6df5859700dd349d5336cddf4d1618957fb41e1c /src
parent4176aa4a4ef22197280ead0954f1987f21a452aa (diff)
downloademacs-c0a58692dac8783c9a4cb153a113f9fb6b72fb8e.tar.gz
emacs-c0a58692dac8783c9a4cb153a113f9fb6b72fb8e.zip
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 22ce74ed963..2015fbf211f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2734,19 +2734,21 @@ read_key_sequence (keybuf, bufsize, prompt)
2734 return t; 2734 return t;
2735} 2735}
2736 2736
2737DEFUN ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 1, 0, 2737DEFUN ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 2, 0,
2738 "Read a sequence of keystrokes and return as a string or vector.\n\ 2738 "Read a sequence of keystrokes and return as a string or vector.\n\
2739The sequence is sufficient to specify a non-prefix command in the\n\ 2739The sequence is sufficient to specify a non-prefix command in the\n\
2740current local and global maps.\n\ 2740current local and global maps.\n\
2741\n\ 2741\n\
2742Arg PROMPT is a prompt string. If nil, do not prompt specially.\n\ 2742First arg PROMPT is a prompt string. If nil, do not prompt specially.\n\
2743Second (optional) arg CONTINUE-ECHO, if non-nil, means this key echos\n\
2744as a continuation of the previous key.\n\
2743\n\ 2745\n\
2744If Emacs is running on multiple screens, switching between screens in\n\ 2746If Emacs is running on multiple screens, switching between screens in\n\
2745the midst of a keystroke will toss any prefix typed so far. A C-g\n\ 2747the midst of a keystroke will toss any prefix typed so far. A C-g\n\
2746typed while in this function is treated like any other character, and\n\ 2748typed while in this function is treated like any other character, and\n\
2747`quit-flag' is not set.") 2749`quit-flag' is not set.")
2748 (prompt) 2750 (prompt, continue_echo)
2749 Lisp_Object prompt; 2751 Lisp_Object prompt, continue_echo;
2750{ 2752{
2751 Lisp_Object keybuf[30]; 2753 Lisp_Object keybuf[30];
2752 register int i; 2754 register int i;
@@ -2760,7 +2762,9 @@ typed while in this function is treated like any other character, and\n\
2760 GCPRO1 (keybuf[0]); 2762 GCPRO1 (keybuf[0]);
2761 gcpro1.nvars = (sizeof keybuf/sizeof (keybuf[0])); 2763 gcpro1.nvars = (sizeof keybuf/sizeof (keybuf[0]));
2762 2764
2763 this_command_key_count = 0; 2765 if (! NILP (continue_echo))
2766 this_command_key_count = 0;
2767
2764 i = read_key_sequence (keybuf, (sizeof keybuf/sizeof (keybuf[0])), 2768 i = read_key_sequence (keybuf, (sizeof keybuf/sizeof (keybuf[0])),
2765 NILP (prompt) ? 0 : XSTRING (prompt)->data); 2769 NILP (prompt) ? 0 : XSTRING (prompt)->data);
2766 2770