diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-04-28 14:48:18 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-04-28 14:48:18 +0000 |
| commit | b33c71f58623306001d4d4fe4f7354d8c360edaa (patch) | |
| tree | 3bcc8154133fcb19081850754bb725f38f86b56f /lisp/calc | |
| parent | 717a00ef34c0f55bfbad80584f00d86c090d547f (diff) | |
| parent | a48b489eb94a238c1eca6a0c4bdf7d5b80503240 (diff) | |
| download | emacs-b33c71f58623306001d4d4fe4f7354d8c360edaa.tar.gz emacs-b33c71f58623306001d4d4fe4f7354d8c360edaa.tar.bz2 emacs-b33c71f58623306001d4d4fe4f7354d8c360edaa.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-234
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-235
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-236
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-237
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-238
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-239
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-240
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-241
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-242
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-243
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-244
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-245
(Ffield_beginning, find_field): Undo change of 2006-04-23.
* emacs@sv.gnu.org/emacs--devo--0--patch-246
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-247
Rcirc patch from Ryan Yeske
* emacs@sv.gnu.org/emacs--devo--0--patch-248
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-249
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-250
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-251
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-87
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-88
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-89
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-90
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-91
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-92
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-93
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-94
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-95
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-553
Diffstat (limited to 'lisp/calc')
| -rw-r--r-- | lisp/calc/calc-embed.el | 4 |
1 files changed, 3 insertions, 1 deletions
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." (substring str pref-len suff-pos))) (if (string-match "[^ \t\n]" str) (setq pref-len 0 - val (math-read-big-expr str)) + val (condition-case nil + (math-read-big-expr str) + (error (math-read-expr str)))) (setq val nil)))) (if (eq (car-safe val) 'error) (setq val (list 'error |