Fix encoding problem in javat-wy.el.

* admin/grammars/java-tags.wy (CHAR): Remove "('\u0000' to '\uffff')"
from summary, as this causes javat-wy.el to contain both a null byte
and a byte sequence that is not valid UTF-8, which is inconvenient.
* lisp/cedet/semantic/wisent/javat-wy.el: Regenerate.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 9389a6af28f29890cbc2f4ffa0e5f637f60b3dd6..fe20d77d9f2fff3b143fcd6a7dde24d623f278a5 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * grammars/java-tags.wy (CHAR): Remove "('\u0000' to '\uffff')"
+       from summary, as this causes javat-wy.el to contain both a null byte
+       and a byte sequence that is not valid UTF-8, which is inconvenient.
+
 2013-03-03  Paul Eggert  <eggert@cs.ucla.edu>
 
        * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.

diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy
index 408d0f0da29aea42f5e7504da4d8cd40129254c2..71607f452a0d2372b7d175742b082b961592e591 100644 (file)
--- a/admin/grammars/java-tags.wy
+++ b/admin/grammars/java-tags.wy
@@ -154,7 +154,7 @@
 
 %keyword CHAR         "char"
 %put     CHAR summary
-"Integral primitive type ('\u0000' to '\uffff') (0 to 65535)"
+"Integral primitive type (0 to 65535)"
 
 %keyword CLASS        "class"
 %put     CLASS summary
@@ -312,7 +312,7 @@
 %keyword WHILE        "while"
 %put     WHILE summary
 "while (<expr>) <stmt> | do <stmt> while (<expr>);"
-  
+
 ;; --------------------------
 ;; Official javadoc line tags
 ;; --------------------------
@@ -340,27 +340,27 @@
 %keyword _AUTHOR      "@author"
 %put     _AUTHOR      javadoc (seq 1 usage (type))
 %keyword _VERSION     "@version"
-%put     _VERSION     javadoc (seq 2 usage (type)) 
+%put     _VERSION     javadoc (seq 2 usage (type))
 %keyword _PARAM       "@param"
-%put     _PARAM       javadoc (seq 3 usage (function) with-name t) 
+%put     _PARAM       javadoc (seq 3 usage (function) with-name t)
 %keyword _RETURN      "@return"
-%put     _RETURN      javadoc (seq 4 usage (function)) 
+%put     _RETURN      javadoc (seq 4 usage (function))
 %keyword _EXCEPTION   "@exception"
-%put     _EXCEPTION   javadoc (seq 5 usage (function) with-name t) 
+%put     _EXCEPTION   javadoc (seq 5 usage (function) with-name t)
 %keyword _THROWS      "@throws"
-%put     _THROWS      javadoc (seq 6 usage (function) with-name t) 
+%put     _THROWS      javadoc (seq 6 usage (function) with-name t)
 %keyword _SEE         "@see"
-%put     _SEE         javadoc (seq 7 usage (type function variable) opt t with-ref t) 
+%put     _SEE         javadoc (seq 7 usage (type function variable) opt t with-ref t)
 %keyword _SINCE       "@since"
-%put     _SINCE       javadoc (seq 8 usage (type function variable) opt t) 
+%put     _SINCE       javadoc (seq 8 usage (type function variable) opt t)
 %keyword _SERIAL      "@serial"
-%put     _SERIAL      javadoc (seq 9 usage (variable) opt t) 
+%put     _SERIAL      javadoc (seq 9 usage (variable) opt t)
 %keyword _SERIALDATA  "@serialData"
-%put     _SERIALDATA  javadoc (seq 10 usage (function) opt t) 
+%put     _SERIALDATA  javadoc (seq 10 usage (function) opt t)
 %keyword _SERIALFIELD "@serialField"
-%put     _SERIALFIELD javadoc (seq 11 usage (variable) opt t) 
+%put     _SERIALFIELD javadoc (seq 11 usage (variable) opt t)
 %keyword _DEPRECATED  "@deprecated"
-%put     _DEPRECATED  javadoc (seq 12 usage (type function variable) opt t) 
+%put     _DEPRECATED  javadoc (seq 12 usage (type function variable) opt t)
 
 %%
 
@@ -387,7 +387,7 @@ package_declaration
   ;
 
 ;;; Include file token
-;; ("FILE" include SYSTEM "DOCSTRING") 
+;; ("FILE" include SYSTEM "DOCSTRING")
 import_declaration
   : IMPORT qualified_name SEMICOLON
     (INCLUDE-TAG $2 nil)
@@ -476,7 +476,7 @@ static_initializer
   ;
 
 ;;; Function token
-;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") 
+;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING")
 constructor_declaration
   : modifiers_opt constructor_declarator throwsc_opt constructor_body
     (FUNCTION-TAG (car $2) nil (cdr $2)
@@ -491,11 +491,11 @@ constructor_declarator
   ;
 
 constructor_body
-  : block 
+  : block
   ;
 
 ;;; Function token
-;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") 
+;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING")
 method_declaration
   : modifiers_opt VOID method_declarator throwsc_opt method_body
     (FUNCTION-TAG (car $3) $2 (cdr $3) :typemodifiers $1 :throws $4)

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 60c15e1718455ba7d737695d553e4e315f25e795..9968d3faa628ca296b347f4aa908536eb4145de2 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * semantic/wisent/javat-wy.el: Regenerate.
+
 2012-11-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * semantic/fw.el (semantic-make-local-hook, semantic-mode-line-update):

diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el
index e666b9c419101e902d55ed00982e9adf51cb63c0..f082358c4f50a00236c17076c8cb057b5a960ca0 100644 (file)
Binary files a/lisp/cedet/semantic/wisent/javat-wy.el and b/lisp/cedet/semantic/wisent/javat-wy.el differ