summaryrefslogtreecommitdiff
path: root/lisp/calc/calc-lang.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-lang.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-lang.el')
-rw-r--r--lisp/calc/calc-lang.el39
1 files changed, 20 insertions, 19 deletions
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index 066d781cc95..9d5020df038 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -94,7 +94,7 @@
(interactive)
(calc-wrapper
(calc-set-language 'c)
- (message "`C' language mode")))
+ (message "‘C’ language mode")))
(put 'c 'math-oper-table
'( ( "u!" calcFunc-lnot -1 1000 )
@@ -387,7 +387,7 @@
math-exp-token 'end
math-expr-data "\000")
x)
- (throw 'syntax "Unmatched closing `/'")))
+ (throw 'syntax "Unmatched closing ‘/’")))
(defun math-parse-fortran-subscr (sym args)
(setq sym (math-build-var-name sym))
@@ -695,7 +695,7 @@
(defun math-parse-tex-sum (f val)
(let (low high save)
- (or (equal math-expr-data "_") (throw 'syntax "Expected `_'"))
+ (or (equal math-expr-data "_") (throw 'syntax "Expected ‘_’"))
(math-read-token)
(setq save math-exp-old-pos)
(setq low (math-read-factor))
@@ -703,7 +703,7 @@
(progn
(setq math-exp-old-pos (1+ save))
(throw 'syntax "Expected equation")))
- (or (equal math-expr-data "^") (throw 'syntax "Expected `^'"))
+ (or (equal math-expr-data "^") (throw 'syntax "Expected ‘^’"))
(math-read-token)
(setq high (math-read-factor))
(list (nth 2 f) (math-read-factor) (nth 1 low) (nth 2 low) high)))
@@ -1165,14 +1165,14 @@
(while (assoc math-expr-data '(("ccol") ("lcol") ("rcol")))
(math-read-token)
(or (equal math-expr-data calc-function-open)
- (throw 'syntax "Expected `{'"))
+ (throw 'syntax "Expected ‘{’"))
(math-read-token)
(setq vec (cons (cons 'vec (math-read-expr-list)) vec))
(or (equal math-expr-data calc-function-close)
- (throw 'syntax "Expected `}'"))
+ (throw 'syntax "Expected ‘}’"))
(math-read-token))
(or (equal math-expr-data calc-function-close)
- (throw 'syntax "Expected `}'"))
+ (throw 'syntax "Expected ‘}’"))
(math-read-token)
(math-transpose (cons 'vec (nreverse vec)))))
@@ -1187,7 +1187,7 @@
(math-read-expr-list))))
(if (not (or (equal math-expr-data calc-function-close)
(eq math-exp-token 'end)))
- (throw 'syntax "Expected `)'"))
+ (throw 'syntax "Expected ‘)’"))
(math-read-token)
(cons (intern (format "calcFunc-%s'" (nth 1 x))) args)))
(list 'var
@@ -1211,7 +1211,7 @@
(interactive)
(calc-wrapper
(calc-set-language 'yacas)
- (message "`Yacas' language mode")))
+ (message "‘Yacas’ language mode")))
(put 'yacas 'math-vector-brackets "{}")
@@ -1427,7 +1427,7 @@
(interactive)
(calc-wrapper
(calc-set-language 'maxima)
- (message "`Maxima' language mode")))
+ (message "‘Maxima’ language mode")))
(put 'maxima 'math-oper-table
'(("+" + 100 100)
@@ -1625,7 +1625,7 @@
(interactive)
(calc-wrapper
(calc-set-language 'giac)
- (message "`Giac' language mode")))
+ (message "‘Giac’ language mode")))
(put 'giac 'math-oper-table
'( ( "[" (math-read-giac-subscr) 250 -1 )
@@ -2237,7 +2237,7 @@ order to Calc's."
(if (= sep ?\.)
(setq h (1+ h)))
(if (= sep ?\])
- (math-read-big-error (1- h) v "Expected `)'"))
+ (math-read-big-error (1- h) v "Expected ‘)’"))
(if (= sep ?\))
(setq p (math-read-big-rec
(1+ math-rb-h1) math-rb-v1 (1- h) math-rb-v2 v))
@@ -2252,7 +2252,7 @@ order to Calc's."
0 1)
p))))
((= (math-read-big-char (1- h) v) ?\])
- (math-read-big-error (1- h) v "Expected `)'"))
+ (math-read-big-error (1- h) v "Expected ‘)’"))
((= sep ?\,)
(or (and (math-realp (car p)) (math-realp (nth 1 p)))
(math-read-big-error
@@ -2280,7 +2280,7 @@ order to Calc's."
(setq h (math-read-big-balance (1+ hleft) v "["))
(if hright
(or (= h hright)
- (math-read-big-error hright v "Expected `]'"))
+ (math-read-big-error hright v "Expected ‘]’"))
(setq hright h))
(setq p (cons (math-read-big-rec
hleft v h (1+ v)) p))
@@ -2293,7 +2293,7 @@ order to Calc's."
(setq h (1+ h)))
(and (= (math-read-big-char h v) ?\])
(setq h (1+ h))))
- (math-read-big-error (1- h) v "Expected `]'"))
+ (math-read-big-error (1- h) v "Expected ‘]’"))
(if (= (math-read-big-char h vtop) ?\,)
(setq h (1+ h)))
(math-read-big-emptyp math-rb-h1 (1+ v) (1- h) math-rb-v2 nil t)
@@ -2317,7 +2317,7 @@ order to Calc's."
(setq widest (math-read-big-char (1- h) v))
(if (or (memq widest '(?\; ?\)))
(and (eq widest ?\.) (cdr p)))
- (math-read-big-error (1- h) v "Expected `]'"))
+ (math-read-big-error (1- h) v "Expected ‘]’"))
(if (= widest ?\.)
(setq h (1+ h)
widest (math-read-big-balance h v "[")
@@ -2369,7 +2369,7 @@ order to Calc's."
h widest)
(= (math-read-big-char (1- h) v) ?\,)))
(or (= (math-read-big-char (1- h) v) ?\))
- (math-read-big-error (1- h) v "Expected `)'"))
+ (math-read-big-error (1- h) v "Expected ‘)’"))
(setq p (cons line (nreverse p))))
(setq p (list 'var
(intern (math-remove-dashes p))
@@ -2432,7 +2432,8 @@ order to Calc's."
(let ((y (math-read-big-rec h math-rb-v1 math-rb-h2
math-rb-v2 baseline nil t)))
(or (= (math-read-big-char math-read-big-h2 baseline) ?\:)
- (math-read-big-error math-read-big-h2 baseline "Expected `:'"))
+ (math-read-big-error math-read-big-h2 baseline
+ "Expected ‘:’"))
(setq p (list (nth 1 widest) p y
(math-read-big-rec
(1+ math-read-big-h2) math-rb-v1 math-rb-h2 math-rb-v2
@@ -2507,7 +2508,7 @@ order to Calc's."
(while (> count 0)
(if (>= h len)
(if what
- (math-read-big-error nil v (format "Unmatched `%s'" what))
+ (math-read-big-error nil v (format "Unmatched ‘%s’" what))
(setq count 0))
(if (memq (aref line h) '(?\( ?\[))
(setq count (1+ count))