diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-21 06:31:54 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-21 06:32:36 -0700 |
commit | 1a38259bbc5aea962a295e49c4d79f89ddeda709 (patch) | |
tree | 784bba944e543a94dd04398d60e7cea414ebe961 /lisp/calc/calc-units.el | |
parent | 88f18ca334600a8d867b7c158a3abdeb6004c08e (diff) | |
download | emacs-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-units.el')
-rw-r--r-- | lisp/calc/calc-units.el | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index f3d02340fe3..d95af9492bd 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -422,7 +422,7 @@ If EXPR is nil, return nil." "Put the units in EXPR in the default units table. If COMP or STD is non-nil, put that in the units table instead." (let* ((new-units (or comp std (math-get-units expr))) - (standard-units (math-get-standard-units + (standard-units (math-get-standard-units (cond (comp (math-simplify-units expr)) (std expr) @@ -457,9 +457,9 @@ If COMP or STD is non-nil, put that in the units table instead." (eq (math-get-standard-units expr) 1)))) (let ((uold (or old-units (progn - (setq uoldname + (setq uoldname (if unitscancel - (read-string + (read-string "(The expression is unitless when simplified) Old Units: ") (read-string "Old units: "))) (if (equal uoldname "") @@ -1621,11 +1621,14 @@ If COMP or STD is non-nil, put that in the units table instead." (insert " " (nth 2 u) "\n") (while (eq (car (car (setq uptr (cdr uptr)))) 0))) (insert "\n\n") - (insert "(**) When in TeX or LaTeX display mode, the TeX specific unit\n" - "names will not use the `tex' prefix; the unit name for a\n" - "TeX point will be `pt' instead of `texpt', for example.\n" - "To avoid conflicts, the unit names for pint and parsec will\n" - "be `pint' and `parsec' instead of `pt' and `pc'.")) + (insert + (format + (concat + "(**) When in TeX or LaTeX display mode, the TeX specific unit\n" + "names will not use the ‘tex’ prefix; the unit name for a\n" + "TeX point will be ‘pt’ instead of ‘texpt’, for example.\n" + "To avoid conflicts, the unit names for pint and parsec will\n" + "be ‘pint’ and ‘parsec’ instead of ‘pt’ and ‘pc’.")))) (view-mode) (message "Formatting units table...done")) (setq math-units-table-buffer-valid t) |