aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-06-04 23:44:38 -0700
committerPaul Eggert2015-06-04 23:54:49 -0700
commit1ba0149572ff9841c4838a25358ef08a516976db (patch)
treec7a38c4bb2ae7a1db5f04529573d78b1a0433410
parent8fb6253c0073aaee5c76762da4356b3c5c56c273 (diff)
downloademacs-1ba0149572ff9841c4838a25358ef08a516976db.tar.gz
emacs-1ba0149572ff9841c4838a25358ef08a516976db.zip
Fix curved quotes in a few places
* lisp/calc/calc-misc.el (calc-help): Fix quoting. The strings in question are not doc strings, so this partially undoes the recent change that assumed they were doc strings. * lisp/cedet/srecode/srt-mode.el (srecode-macro-help): * lisp/info.el (Info-finder-find-node): Use curved quotes. * lisp/emacs-lisp/derived.el (derived-mode-make-docstring): Also allow curved quotes in doc strings.
-rw-r--r--lisp/calc/calc-misc.el4
-rw-r--r--lisp/cedet/srecode/srt-mode.el4
-rw-r--r--lisp/emacs-lisp/derived.el3
-rw-r--r--lisp/info.el4
4 files changed, 8 insertions, 7 deletions
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index 60c6fb9782c..5d5f4ce0c86 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -217,7 +217,7 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
217(defun calc-help () 217(defun calc-help ()
218 (interactive) 218 (interactive)
219 (let ((msgs 219 (let ((msgs
220 '("Press `h' for complete help; press `?' repeatedly for a summary" 220 '("Press h for complete help; press ? repeatedly for a summary"
221 "Letter keys: Negate; Precision; Yank; Why; Xtended cmd; Quit" 221 "Letter keys: Negate; Precision; Yank; Why; Xtended cmd; Quit"
222 "Letter keys: SHIFT + Undo, reDo; Inverse, Hyperbolic, Option" 222 "Letter keys: SHIFT + Undo, reDo; Inverse, Hyperbolic, Option"
223 "Letter keys: SHIFT + sQrt; Sin, Cos, Tan; Exp, Ln, logB" 223 "Letter keys: SHIFT + sQrt; Sin, Cos, Tan; Exp, Ln, logB"
@@ -225,7 +225,7 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C).
225 "Letter keys: SHIFT + Num-eval; More-recn; eXec-kbd-macro; Keep-args" 225 "Letter keys: SHIFT + Num-eval; More-recn; eXec-kbd-macro; Keep-args"
226 "Other keys: +, -, *, /, ^, \\ (int div), : (frac div)" 226 "Other keys: +, -, *, /, ^, \\ (int div), : (frac div)"
227 "Other keys: & (1/x), | (concat), % (modulo), ! (factorial)" 227 "Other keys: & (1/x), | (concat), % (modulo), ! (factorial)"
228 "Other keys: ' (alg-entry), = (eval), \\=` (edit); M-RET (last-args)" 228 "Other keys: ' (alg-entry), = (eval), ` (edit); M-RET (last-args)"
229 "Other keys: SPC/RET (enter/dup), LFD (over); < > (scroll horiz)" 229 "Other keys: SPC/RET (enter/dup), LFD (over); < > (scroll horiz)"
230 "Other keys: DEL (drop), M-DEL (drop-above); { } (scroll vert)" 230 "Other keys: DEL (drop), M-DEL (drop-above); { } (scroll vert)"
231 "Other keys: TAB (swap/roll-dn), M-TAB (roll-up)" 231 "Other keys: TAB (swap/roll-dn), M-TAB (roll-up)"
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 79672ec3b1b..fbc56357b1c 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -258,9 +258,9 @@ we can tell font lock about them.")
258 (when (class-abstract-p C) 258 (when (class-abstract-p C)
259 (throw 'skip nil)) 259 (throw 'skip nil))
260 260
261 (princ "`") 261 (princ "")
262 (princ name) 262 (princ name)
263 (princ "'") 263 (princ "")
264 (when (slot-exists-p C 'key) 264 (when (slot-exists-p C 'key)
265 (when key 265 (when key
266 (princ " - Character Key: ") 266 (princ " - Character Key: ")
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 52da4c99eaf..75bd325d9db 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -331,7 +331,8 @@ which more-or-less shadow%s %s's corresponding table%s."
331 "\n\nThis mode " 331 "\n\nThis mode "
332 (concat 332 (concat
333 "\n\nIn addition to any hooks its parent mode " 333 "\n\nIn addition to any hooks its parent mode "
334 (if (string-match (regexp-quote (format "`%s'" parent)) 334 (if (string-match (regexp-quote (format "[`‘]%s['’]"
335 parent))
335 docstring) nil 336 docstring) nil
336 (format "`%s' " parent)) 337 (format "`%s' " parent))
337 "might have run,\nthis mode ")) 338 "might have run,\nthis mode "))
diff --git a/lisp/info.el b/lisp/info.el
index 59ce465f5aa..9602337e193 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3707,7 +3707,7 @@ Build a menu of the possible matches."
3707 (insert "Finder Packages\n") 3707 (insert "Finder Packages\n")
3708 (insert "***************\n\n") 3708 (insert "***************\n\n")
3709 (insert 3709 (insert
3710 "The following packages match the keyword `" nodename "':\n\n") 3710 "The following packages match the keyword " nodename ":\n\n")
3711 (insert "* Menu:\n\n") 3711 (insert "* Menu:\n\n")
3712 (let ((keywords 3712 (let ((keywords
3713 (mapcar #'intern (if (string-match-p "," nodename) 3713 (mapcar #'intern (if (string-match-p "," nodename)
@@ -3734,7 +3734,7 @@ Build a menu of the possible matches."
3734 (insert "Package Description\n") 3734 (insert "Package Description\n")
3735 (insert "*******************\n\n") 3735 (insert "*******************\n\n")
3736 (insert 3736 (insert
3737 "Description of the package `" nodename "':\n\n") 3737 "Description of the package " nodename ":\n\n")
3738 ;; This assumes that a file named package.el exists, 3738 ;; This assumes that a file named package.el exists,
3739 ;; which is not always true. E.g. for the nxml package, 3739 ;; which is not always true. E.g. for the nxml package,
3740 ;; there is no "nxml.el" (it's nxml-mode.el). 3740 ;; there is no "nxml.el" (it's nxml-mode.el).