From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Thu, 27 Apr 2006 18:40:41 +0000 (+0000)
Subject: (calc-embedded-make-info): Use `math-read-expr' when
X-Git-Tag: emacs-pretest-22.0.90~2924
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a48b489eb94a238c1eca6a0c4bdf7d5b80503240;p=emacs.git

(calc-embedded-make-info): Use `math-read-expr' when
`math-read-big-expr' doesn't work.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f961f6f1315..0b384c6d8c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-27  Jay Belanger  <belanger@truman.edu>
+
+	* calc-embed.el (calc-embedded-make-info): Use `math-read-expr' to
+	read expression when `math-read-big-expr' doesn't work.
+
 2006-04-27  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* 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."
 			     (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