aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2004-09-04 13:17:34 +0000
committerEli Zaretskii2004-09-04 13:17:34 +0000
commit0721fbe3c2761509b246980d2000275e8582fb6c (patch)
tree6cf8748db3a9e04c13d01a2ac9563e9a2a79890f
parent23f87bede063c31c164f97278caabdc5cf5e6980 (diff)
downloademacs-0721fbe3c2761509b246980d2000275e8582fb6c.tar.gz
emacs-0721fbe3c2761509b246980d2000275e8582fb6c.zip
(te-escape): Show `?' in prompt for help key.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/terminal.el8
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd83a9524e2..85f2ae468de 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12004-09-04 Jari Aalto <jari.aalto@poboxes.com>
2
3 * terminal.el (te-escape): Show `?' in prompt for help key.
4
12004-09-04 Emilio C. Lopes <eclig@gmx.net> 52004-09-04 Emilio C. Lopes <eclig@gmx.net>
2 6
3 * emacs-lisp/lisp.el (kill-backward-up-list): New function. 7 * emacs-lisp/lisp.el (kill-backward-up-list): New function.
diff --git a/lisp/terminal.el b/lisp/terminal.el
index 64c58d7743d..d33ba914cd3 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -209,9 +209,13 @@ performance."
209 (use-local-map terminal-escape-map) 209 (use-local-map terminal-escape-map)
210 (setq s (read-key-sequence 210 (setq s (read-key-sequence
211 (if current-prefix-arg 211 (if current-prefix-arg
212 (format "Emacs Terminal escape> %d " 212 (format "Emacs Terminal escape[%s for help]> %d "
213 (substitute-command-keys
214 "\\<terminal-escape-map>\\[te-escape-help]")
213 (prefix-numeric-value current-prefix-arg)) 215 (prefix-numeric-value current-prefix-arg))
214 "Emacs Terminal escape> ")))) 216 (format "Emacs Terminal escape[%s for help]> "
217 (substitute-command-keys
218 "\\<terminal-escape-map>\\[te-escape-help]"))))))
215 (use-global-map global) 219 (use-global-map global)
216 (use-local-map local)) 220 (use-local-map local))
217 221