Mercurial > emacs
changeset 110418:a141021cb63f
calc-prog.el (calc-read-parse-table-part): Don't "fix" the empty
string when it follows a repeated or optional pattern.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Sat, 18 Sep 2010 12:23:12 -0500 |
| parents | 8a3552ec7934 |
| children | bde55f3d7125 |
| files | lisp/ChangeLog lisp/calc/calc-prog.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Sep 18 18:21:16 2010 +0200 +++ b/lisp/ChangeLog Sat Sep 18 12:23:12 2010 -0500 @@ -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.
--- a/lisp/calc/calc-prog.el Sat Sep 18 18:21:16 2010 +0200 +++ b/lisp/calc/calc-prog.el Sat Sep 18 12:23:12 2010 -0500 @@ -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)