diff options
Diffstat (limited to 'lisp/calc')
| -rw-r--r-- | lisp/calc/calc-graph.el | 4 | ||||
| -rw-r--r-- | lisp/calc/calc-help.el | 2 | ||||
| -rw-r--r-- | lisp/calc/calc-lang.el | 6 | ||||
| -rw-r--r-- | lisp/calc/calc.el | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index 317f403ead6..56f11c67119 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el @@ -1121,7 +1121,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0." (eval (intern (concat "var-" (save-excursion - (re-search-backward ":\\(.*\\)\\}") + (re-search-backward ":\\(.*\\)}") (match-string 1)))))) (error nil))) (if yerr @@ -1186,7 +1186,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0." (or (looking-at "{") (error "Can't hide this curve (wrong format)")) (forward-char 1) - (if (looking-at "*") + (if (looking-at "\\*") (if (or (null flag) (<= (prefix-numeric-value flag) 0)) (delete-char 1)) (if (or (null flag) (> (prefix-numeric-value flag) 0)) diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el index cf7574e7385..d9e8fe779bf 100644 --- a/lisp/calc/calc-help.el +++ b/lisp/calc/calc-help.el @@ -172,7 +172,7 @@ C-w Describe how there is no warranty for Calc." (setq desc (concat "M-" (substring desc 4)))) (while (string-match "^M-# \\(ESC \\|C-\\)" desc) (setq desc (concat "M-# " (substring desc (match-end 0))))) - (if (string-match "\\(DEL\\|\\LFD\\|RET\\|SPC\\|TAB\\)" desc) + (if (string-match "\\(DEL\\|LFD\\|RET\\|SPC\\|TAB\\)" desc) (setq desc (replace-match "<\\&>" nil nil desc))) (if briefly (let ((msg (with-current-buffer (get-buffer-create "*Calc Summary*") diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el index 3f55fb15d56..ee107df39c1 100644 --- a/lisp/calc/calc-lang.el +++ b/lisp/calc/calc-lang.el @@ -753,8 +753,8 @@ right " \\right)")) ((and (eq (aref func 0) ?\\) (not (or - (string-match "\\hbox{" func) - (string-match "\\text{" func))) + (string-match "\\\\hbox{" func) + (string-match "\\\\text{" func))) (= (length a) 2) (or (Math-realp (nth 1 a)) (memq (car (nth 1 a)) '(var *)))) @@ -1127,7 +1127,7 @@ (math-read-token))))))) (put 'eqn 'math-lang-read - '((eq (string-match "->\\|<-\\|+-\\|\\\\dots\\|~\\|\\^" + '((eq (string-match "->\\|<-\\|\\+-\\|\\\\dots\\|~\\|\\^" math-exp-str math-exp-pos) math-exp-pos) (progn diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 7390ea350e1..35f13f9656a 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -2430,7 +2430,7 @@ the United States." (beep) (and (not (calc-minibuffer-contains "[-+]?\\(1[5-9]\\|[2-9][0-9]\\)#.*")) (search-forward "e" nil t)) - (if (looking-at "+") + (if (looking-at "\\+") (delete-char 1)) (if (looking-at "-") (delete-char 1) |