aboutsummaryrefslogtreecommitdiffhomepage
path: root/generic
diff options
context:
space:
mode:
authorGravatar David Aspinall <da@inf.ed.ac.uk>2004-04-17 18:51:38 +0000
committerGravatar David Aspinall <da@inf.ed.ac.uk>2004-04-17 18:51:38 +0000
commitfa608bef41c409dbf2df291d667ac390c8a4b35b (patch)
tree6b71703c506df4df38c8a43749f77864d7988403 /generic
parent87e9adcad2e8adc6ddaa6b908c8d98ef842ac26f (diff)
Escape the string from substitute-command-keys in proof-defshortcut, proof-definvisible.
Diffstat (limited to 'generic')
-rw-r--r--generic/proof-menu.el23
1 files changed, 21 insertions, 2 deletions
diff --git a/generic/proof-menu.el b/generic/proof-menu.el
index 694be484..2cf26cf1 100644
--- a/generic/proof-menu.el
+++ b/generic/proof-menu.el
@@ -516,6 +516,21 @@ without adjusting window layout."
;;; Define stuff from favourites
+`substitute-command-keys' is a built-in function
+(substitute-command-keys STRING)
+
+Documentation:
+Substitute key descriptions for command names in STRING.
+Return a new string which is STRING with substrings of the form \[COMMAND]
+replaced by either: a keystroke sequence that will invoke COMMAND,
+or "M-x COMMAND" if COMMAND is not on any keys.
+Substrings of the form \{MAPVAR} are replaced by summaries
+(made by `describe-bindings') of the value of MAPVAR, taken as a keymap.
+Substrings of the form \<MAPVAR> specify to use the value of MAPVAR
+as the keymap for future \[COMMAND] substrings.
+\= quotes the following character and is discarded;
+thus, \=\= puts \= into the output, and \=\[ puts \[ into the output.
+
;;;###autoload
(defmacro proof-defshortcut (fn string &optional key)
"Define shortcut function FN to insert STRING, optional keydef KEY.
@@ -526,7 +541,9 @@ KEY is added onto proof-assistant map."
(if ,key
(define-key (proof-ass keymap) (quote ,key) (quote ,fn)))
(defun ,fn ()
- ,(concat "Shortcut command to insert " string " into the current buffer.")
+ ,(concat "Shortcut command to insert "
+ (replace-in-string string "\\\\" "\\=") ;; for substitute-command-keys
+ " into the current buffer.\nThis simply calls `proof-insert', which see.")
(interactive)
(proof-insert ,string))))
@@ -540,7 +557,9 @@ KEY is added onto proof-assistant map."
(if ,key
(define-key (proof-ass keymap) (quote ,key) (quote ,fn)))
(defun ,fn ()
- ,(concat "Command to send " string " to the proof assistant.")
+ ,(concat "Command to send "
+ (replace-in-string string "\\\\" "\\=") ;; for substitute-command-keys
+ " to the proof assistant.")
(interactive)
(proof-shell-invisible-command ,string))))