aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-08-19 09:40:33 -0700
committerPaul Eggert2015-08-19 09:41:31 -0700
commitec07cfbee12528b9800a8c8fa019af72e3c9cfe4 (patch)
tree878d99e22b289a5eb391074df98e607f613d4a5b
parentae7cfd0baf24fda984ff4c0631bcaa477ea11b7f (diff)
downloademacs-ec07cfbee12528b9800a8c8fa019af72e3c9cfe4.tar.gz
emacs-ec07cfbee12528b9800a8c8fa019af72e3c9cfe4.zip
Fix key binding quoting in tutorial *Help*
* lisp/tutorial.el (tutorial--describe-nonstandard-key): When generating help for custom key bindings, use the user-preferred quoting style rather than hardcoding the grave style.
-rw-r--r--lisp/tutorial.el24
1 files changed, 10 insertions, 14 deletions
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 3b007610c9e..9fea3162810 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -134,21 +134,19 @@ options:
134 (eq map (symbol-value s)) 134 (eq map (symbol-value s))
135 ;; then save this value in mapsym 135 ;; then save this value in mapsym
136 (setq mapsym s))))) 136 (setq mapsym s)))))
137 (insert "The default Emacs binding for the key " 137 (insert
138 (key-description key) 138 (format
139 " is the command `") 139 "The default Emacs binding for the key %s is the command ‘%s’. "
140 (insert (format "%s" db)) 140 (key-description key)
141 (insert "'. " 141 db))
142 "However, your customizations have " 142 (insert "However, your customizations have "
143 (if cb 143 (if cb
144 (format "rebound it to the command `%s'" cb) 144 (format "rebound it to the command %s" cb)
145 "unbound it")) 145 "unbound it"))
146 (insert ".") 146 (insert ".")
147 (when mapsym 147 (when mapsym
148 (insert " (For the more advanced user:" 148 (insert " (For the more advanced user:"
149 " This binding is in the keymap `" 149 (format " This binding is in the keymap ‘%s’.)" mapsym)))
150 (format "%s" mapsym)
151 "'.)"))
152 (if (string= where "") 150 (if (string= where "")
153 (unless (keymapp db) 151 (unless (keymapp db)
154 (insert "\n\nYou can use M-x " 152 (insert "\n\nYou can use M-x "
@@ -160,9 +158,7 @@ options:
160 "" 158 ""
161 "the key") 159 "the key")
162 where 160 where
163 " to get the function `" 161 (format " to get the function ‘%s’." db))))
164 (format "%s" db)
165 "'.")))
166 (fill-region (point-min) (point))))) 162 (fill-region (point-min) (point)))))
167 (help-print-return-message)))) 163 (help-print-return-message))))
168 164
@@ -454,7 +450,7 @@ where
454 (lookup-key global-map 450 (lookup-key global-map
455 [menu-bar])))) 451 [menu-bar]))))
456 (stringp cwhere)) 452 (stringp cwhere))
457 (format "the `%s' menu" cwhere) 453 (format "the %s menu" cwhere)
458 "the menus")))) 454 "the menus"))))
459 (setq where "")) 455 (setq where ""))
460 (setq remark nil) 456 (setq remark nil)