From c2a845b50432e9d6b5fdfb53dab420193056ceb9 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Sat, 18 Sep 2010 12:23:12 -0500 Subject: [PATCH] calc-prog.el (calc-read-parse-table-part): Don't "fix" the empty string when it follows a repeated or optional pattern. --- lisp/ChangeLog | 5 +++++ lisp/calc/calc-prog.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * 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 * 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) -- 2.39.2