diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-09-03 16:02:28 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-09-03 16:02:28 -0400 |
| commit | 944d77f070da388b0c6e6578a9f868e88c088940 (patch) | |
| tree | 4b4525adbe8894560768e37214f9f82816fbd574 /src/keyboard.h | |
| parent | c624ab229bdcefb42e4b81ff613e53c982f58cc1 (diff) | |
| download | emacs-944d77f070da388b0c6e6578a9f868e88c088940.tar.gz | |
Re-add the notion of echo_prompt lost in the translation
* src/keyboard.h (struct kboard): Replace echo_after_prompt with new
echo_prompt which contains the actual string. Update all uses.
* src/keyboard.c (kset_echo_prompt): New function.
(echo_update): Add echo_prompt at the very beginning.
(read_char): Remove workaround for bug#19875, not needed any more.
(read_key_sequence): Set echo_prompt rather than echo_string (bug#21403).
(mark_kboards): Mark echo_prompt.
Diffstat (limited to 'src/keyboard.h')
| -rw-r--r-- | src/keyboard.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/keyboard.h b/src/keyboard.h index 3e4c475d285..0402e0a582c 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -175,9 +175,8 @@ struct kboard /* True means echo each character as typed. */ bool_bf immediate_echo : 1; - /* If we have echoed a prompt string specified by the user, - this is its length in characters. Otherwise this is -1. */ - ptrdiff_t echo_after_prompt; + /* If we have a prompt string specified by the user, this is it. */ + Lisp_Object echo_prompt_; }; INLINE void |