Commits

Anonymous committed 9e69137

Correct an error in my #'edmacro-parse-word syntax, thank you Smoketest

Comments (0)

Files changed (2)

+2010-09-03  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* edmacro.el (edmacro-parse-word):
+	Only #'read if WORD actually matched the regexp avoiding errors
+	when WORD is not valid Lisp syntax. Logic error on my part, caught
+	by the smoketest; thank you Mats Lidell!
+
 2010-09-02  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* edmacro.el (edmacro-parse-word):
                           (t (intern (string arg))))))
 	   (add
 	    (cond
-	     ((prog1 nil
-                (string-match "^\\\\[0-7]\\{1,3\\}$" word)
-                ;; Octal value of a character. If it's numerically out of
-                ;; range, allow the Lisp reader to error. If read succedds,
-                ;; we handle the actual numeric value further down.
-                (setq word (read (concat "\"" word "\"")))))
+	     ((and (string-match "^\\\\[0-7]\\{1,3\\}$" word)
+                   ;; Octal value of a character. If it's numerically out of
+                   ;; range, allow the Lisp reader to error.
+                   (setq word (read (concat "\"" word "\"")))
+                   ;; This clause never succeeds, we want to handle the
+                   ;; actual numeric value further down:
+                   nil))
 	     ((string-match "^<<.+>>$" word)
 	      ;; Extended command.
 	      (nconc