diff options
| author | Jay Belanger | 2006-04-27 18:40:41 +0000 |
|---|---|---|
| committer | Jay Belanger | 2006-04-27 18:40:41 +0000 |
| commit | a48b489eb94a238c1eca6a0c4bdf7d5b80503240 (patch) | |
| tree | 54846d3793cb0943da2d8a398029e00aac3e8846 /lisp | |
| parent | cb58ea33227cfe3fa6bc71483097a0aecfff826f (diff) | |
| download | emacs-a48b489eb94a238c1eca6a0c4bdf7d5b80503240.tar.gz emacs-a48b489eb94a238c1eca6a0c4bdf7d5b80503240.zip | |
(calc-embedded-make-info): Use `math-read-expr' when
`math-read-big-expr' doesn't work.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calc/calc-embed.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f961f6f1315..0b384c6d8c3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-04-27 Jay Belanger <belanger@truman.edu> | ||
| 2 | |||
| 3 | * calc-embed.el (calc-embedded-make-info): Use `math-read-expr' to | ||
| 4 | read expression when `math-read-big-expr' doesn't work. | ||
| 5 | |||
| 1 | 2006-04-27 Reiner Steib <Reiner.Steib@gmx.de> | 6 | 2006-04-27 Reiner Steib <Reiner.Steib@gmx.de> |
| 2 | 7 | ||
| 3 | * startup.el (command-line-1): Display warning when | 8 | * startup.el (command-line-1): Display warning when |
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index 28a319f84e4..adb94ef7381 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el | |||
| @@ -932,7 +932,9 @@ The command \\[yank] can retrieve it from there." | |||
| 932 | (substring str pref-len suff-pos))) | 932 | (substring str pref-len suff-pos))) |
| 933 | (if (string-match "[^ \t\n]" str) | 933 | (if (string-match "[^ \t\n]" str) |
| 934 | (setq pref-len 0 | 934 | (setq pref-len 0 |
| 935 | val (math-read-big-expr str)) | 935 | val (condition-case nil |
| 936 | (math-read-big-expr str) | ||
| 937 | (error (math-read-expr str)))) | ||
| 936 | (setq val nil)))) | 938 | (setq val nil)))) |
| 937 | (if (eq (car-safe val) 'error) | 939 | (if (eq (car-safe val) 'error) |
| 938 | (setq val (list 'error | 940 | (setq val (list 'error |