calc-prog.el (calc-read-parse-table-part): Don't "fix" the empty

string when it follows a repeated or optional pattern.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0914fa82d8778291f6ec82f2847b8c85cb186ec6..11b76ccc18ffdf99dec649542e8716498eb2c472 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-18  Jay Belanger  <jay.p.belanger@gmail.com>
+
+       * calc/calc-prog.el (calc-read-parse-table-part): Don't "fix" the
+       empty string when it follows a repeated or optional pattern.
+
 2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * indent.el (indent-according-to-mode): Apply syntax-propertize.

diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index 5e4adace91efd7306c78f07f29b6720a9bd14643..91017627699bbeeb1a34f22ad08ba8e6bb07dd66 100644 (file)
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -627,7 +627,8 @@
                        (error "Separator not allowed with { ... }?"))
                   (if (string-match "\\`\"" sep)
                       (setq sep (read-from-string sep)))
-                  (setq sep (calc-fix-token-name sep))
+                   (if (> (length sep) 0)
+                       (setq sep (calc-fix-token-name sep)))
                   (setq part (nconc part
                                     (list (list sym p
                                                 (and (> (length sep) 0)