Merge from mainline.

2 files changed, 12 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 221d5c0586c..ac6031fa205 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-02  Eric Ludlam <zappo@gnu.org>
+
+        * grammars/srecode-template.wy (variable): Accept a single number
+        as a variable value.  Allows the 'priority' to be set to a number.
+        (wisent-srecode-template-lexer): Move number up so it can be
+        created.
+
 2013-05-16  Glenn Morris  <rgm@gnu.org>
 
         * cus-test.el (cus-test-cus-load-groups): New function.
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy
index de9bf351ac6..fd3f61905d3 100644
--- a/admin/grammars/srecode-template.wy
+++ b/admin/grammars/srecode-template.wy
@@ -125,6 +125,10 @@ opt-read-fcn
 variable
   : SET symbol insertable-string-list newline
     (VARIABLE-TAG $2 nil $3)
+  | SET symbol number newline
+    ;; This so a common error w/ priority works.
+    ;; Note that "number" still has a string value in the lexer.
+    (VARIABLE-TAG $2 nil (list $3))
   | SHOW symbol newline
     (VARIABLE-TAG $2 nil t)
   ;
@@ -260,8 +264,8 @@ It ignores whitespace, newlines and comments."
   srecode-template-separator-block
   srecode-template-wy--<keyword>-keyword-analyzer
   srecode-template-property-analyzer
-  srecode-template-wy--<symbol>-regexp-analyzer
   srecode-template-wy--<number>-regexp-analyzer
+  srecode-template-wy--<symbol>-regexp-analyzer
   srecode-template-wy--<string>-sexp-analyzer
   srecode-template-wy--<punctuation>-string-analyzer
   semantic-lex-default-action