diff options
| author | Miles Bader <miles@gnu.org> | 2007-12-16 05:08:49 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-12-16 05:08:49 +0000 |
| commit | d29ee6b1a110cf5d170a10317a96acbbd4a1c68b (patch) | |
| tree | 58f3c40766d8d56de7d2b026c29e198764d910aa /lisp/calc/calc-aent.el | |
| parent | 7e095e45a3f790e4608c88db9648d248e24901dc (diff) | |
| parent | 47854a55680b5809811caf72f66ecbe8289c2855 (diff) | |
| download | emacs-d29ee6b1a110cf5d170a10317a96acbbd4a1c68b.tar.gz emacs-d29ee6b1a110cf5d170a10317a96acbbd4a1c68b.tar.bz2 emacs-d29ee6b1a110cf5d170a10317a96acbbd4a1c68b.zip | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300
Diffstat (limited to 'lisp/calc/calc-aent.el')
| -rw-r--r-- | lisp/calc/calc-aent.el | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el index 697d510ac02..ee9c6e61e4c 100644 --- a/lisp/calc/calc-aent.el +++ b/lisp/calc/calc-aent.el @@ -1015,6 +1015,19 @@ in Calc algebraic input.") (concat (math-match-substring x 1) "-" (math-match-substring x 2))) x)) +(defun math-restore-underscores (x) + "Replace pound signs by underscores in the symbol x. +If the current Calc language does not allow underscores, return nil." + (if (memq calc-language calc-lang-allow-underscores) + (intern-soft (math-string-restore-underscores (symbol-name x))))) + +(defun math-string-restore-underscores (x) + "Replace pound signs by underscores in the string x." + (if (string-match "\\`\\(.*\\)#\\(.*\\)\\'" x) + (math-string-restore-underscores + (concat (math-match-substring x 1) "_" (math-match-substring x 2))) + x)) + (defun math-read-if (cond op) (let ((then (math-read-expr-level 0))) (or (equal math-expr-data ":") @@ -1116,7 +1129,10 @@ in Calc algebraic input.") sym (intern (concat "var-" (symbol-name sym))))))) - (let ((v (assq (nth 1 val) math-expr-variable-mapping))) + (let ((v (or + (assq (nth 1 val) math-expr-variable-mapping) + (assq (math-restore-underscores (nth 1 val)) + math-expr-variable-mapping)))) (and v (setq val (if (consp (cdr v)) (funcall (car (cdr v)) v val) (list 'var |