[Emacs-diffs] /srv/bzr/emacs/trunk r101480: calc-prog.el (calc-read-parse-table-part): Don't "fix" the empty

[Jay Belanger]

------------------------------------------------------------
revno: 101480
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-18 12:23:12 -0500
message:
  calc-prog.el (calc-read-parse-table-part): Don't "fix" the empty
  string when it follows a repeated or optional pattern.
modified:
  lisp/ChangeLog
  lisp/calc/calc-prog.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-18 16:21:16 +0000
+++ b/lisp/ChangeLog    2010-09-18 17:23:12 +0000
@@ -1,3 +1,8 @@
+2010-09-18  Jay Belanger  <address@hidden>
+
+       * 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  <address@hidden>
 
        * indent.el (indent-according-to-mode): Apply syntax-propertize.

=== modified file 'lisp/calc/calc-prog.el'
--- a/lisp/calc/calc-prog.el    2010-01-13 08:35:10 +0000
+++ b/lisp/calc/calc-prog.el    2010-09-18 17:23:12 +0000
@@ -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)