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

string when it follows a repeated or optional pattern.

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0914fa82d87..11b76ccc18f 100644
--- 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 5e4adace91e..91017627699 100644
--- 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)