summaryrefslogtreecommitdiff
path: root/lisp/calc/calc-help.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-08-21 06:31:54 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2015-08-21 06:32:36 -0700
commit1a38259bbc5aea962a295e49c4d79f89ddeda709 (patch)
tree784bba944e543a94dd04398d60e7cea414ebe961 /lisp/calc/calc-help.el
parent88f18ca334600a8d867b7c158a3abdeb6004c08e (diff)
downloademacs-1a38259bbc5aea962a295e49c4d79f89ddeda709.tar.gz
Respect text-quoting-style in calc
In calc, tespect text-quoting-style preference in diagnostic formats and fix a few similar problems in docstrings. * lisp/calc/calc-aent.el (math-read-factor): * lisp/calc/calc-embed.el (calc-do-embedded): * lisp/calc/calc-ext.el (calc-user-function-list) * lisp/calc/calc-graph.el (calc-graph-show-dumb): * lisp/calc/calc-help.el (calc-describe-key) (calc-describe-thing): * lisp/calc/calc-lang.el (calc-c-language) (math-parse-fortran-vector-end, math-parse-tex-sum) (math-parse-eqn-matrix, math-parse-eqn-prime) (calc-yacas-language, calc-maxima-language, calc-giac-language) (math-read-big-rec, math-read-big-balance): * lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes) (calc-auto-recompute): * lisp/calc/calc-prog.el (calc-user-define-invocation) (math-do-arg-check): * lisp/calc/calc-store.el (calc-edit-variable): * lisp/calc/calc-units.el (math-build-units-table-buffer): * lisp/calc/calc-vec.el (math-read-brackets): * lisp/calc/calc-yank.el (calc-edit-mode): * lisp/calc/calc.el (calc, calc-do, calc-user-invocation): Use curved quotes in diagnostic format strings. * lisp/calc/calc-help.el (calc-describe-thing): Format docstrings with substitute-command-keys. * lisp/calc/calc-help.el (calc-j-prefix-help): * lisp/calc/calc-misc.el (calc-help): * lisp/calc/calc-ext.el (calc-shift-Z-prefix-help): Escape a docstring "`".
Diffstat (limited to 'lisp/calc/calc-help.el')
-rw-r--r--lisp/calc/calc-help.el30
1 files changed, 18 insertions, 12 deletions
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 7a1a983e6b3..01ab49510cd 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -240,7 +240,7 @@ C-w Describe how there is no warranty for Calc."
(if (string-match "\\` +" prompts)
(setq prompts (substring prompts (match-end 0))))
(setq msg (format
- "%s: %s%s`%s'%s%s %s%s"
+ "%s: %s%s‘%s’%s%s %s%s"
(if (string-match
"\\`\\(calc-[-a-zA-Z0-9]+\\) *\\(.*\\)\\'"
cmd)
@@ -345,7 +345,7 @@ C-w Describe how there is no warranty for Calc."
(calc-describe-thing var "Variable Index"))
(defun calc-describe-thing (thing where &optional target not-quoted)
- (message "Looking for `%s' in %s..." thing where)
+ (message "Looking for ‘%s’ in %s..." thing where)
(let ((savewin (current-window-configuration)))
(calc-info-goto-node where)
(or (let ((case-fold-search nil))
@@ -361,7 +361,7 @@ C-w Describe how there is no warranty for Calc."
(if Info-history
(Info-last))
(set-window-configuration savewin)
- (error "Can't find `%s' in %s" thing where)))
+ (error "Can't find ‘%s’ in %s" thing where)))
(let (Info-history)
(Info-goto-node (buffer-substring (match-beginning 1) (match-end 1))))
(let* ((string-target (or target thing))
@@ -380,7 +380,7 @@ C-w Describe how there is no warranty for Calc."
(re-search-forward quoted nil t)
(search-forward string-target nil t)))))
(beginning-of-line)
- (message "Found `%s' in %s" thing where)))
+ (message "Found ‘%s’ in %s" thing where)))
(defun calc-view-news ()
(interactive)
@@ -400,11 +400,13 @@ C-w Describe how there is no warranty for Calc."
(princ "GNU Emacs Calculator.\n")
(princ " By Dave Gillespie.\n")
(princ (format " %s\n\n" emacs-copyright))
- (princ "Type `h s' for a more detailed summary.\n")
- (princ "Or type `h i' to read the full Calc manual on-line.\n\n")
+ (princ (format "Type ‘h s’ for a more detailed summary.\n"))
+ (princ (format "Or type ‘h i’ to read the full Calc manual on-line.\n\n"))
(princ "Basic keys:\n")
(let* ((calc-full-help-flag t))
- (mapc (function (lambda (x) (princ (format " %s\n" x))))
+ (mapc (function (lambda (x) (princ (format
+ " %s\n"
+ (substitute-command-keys x)))))
(nreverse (cdr (reverse (cdr (calc-help))))))
(mapc (function (lambda (prefix)
(let ((msgs (condition-case err
@@ -413,18 +415,22 @@ C-w Describe how there is no warranty for Calc."
(if (car msgs)
(princ
(if (eq (nth 2 msgs) ?v)
- "\n`v' or `V' prefix (vector/matrix) keys: \n"
+ (format
+ "\n‘v’ or ‘V’ prefix (vector/matrix) keys: \n")
(if (nth 2 msgs)
(format
- "\n`%c' prefix (%s) keys:\n"
+ "\n‘%c’ prefix (%s) keys:\n"
(nth 2 msgs)
(or (cdr (assq (nth 2 msgs)
calc-help-long-names))
(nth 1 msgs)))
(format "\n%s-modified keys:\n"
(capitalize (nth 1 msgs)))))))
- (mapcar (function (lambda (x)
- (princ (format " %s\n" x))))
+ (mapcar (function
+ (lambda (x)
+ (princ (format
+ " %s\n"
+ (substitute-command-keys x)))))
(car msgs)))))
'(calc-inverse-prefix-help
calc-hyperbolic-prefix-help
@@ -539,7 +545,7 @@ C-w Describe how there is no warranty for Calc."
'("Select, Additional, Once; eVal, Formula; Rewrite"
"More, Less, 1-9, Next, Previous"
"Unselect, Clear; Display; Enable; Breakable"
- "' (replace), ` (edit), +, -, *, /, RET (grab), DEL"
+ "' (replace), \\=` (edit), +, -, *, /, RET (grab), DEL"
"SHIFT + swap: Left, Right; maybe: Select, Once"
"SHIFT + Commute, Merge, Distrib, jump-Eqn, Isolate"
"SHIFT + Negate, & (invert); Unpack")