Some copyright header fixes for grammar files.

* etc/grammars/wisent-grammar.el: Make the Python copyright the
literally required one.

* lisp/cedet/semantic/wisent/python-wy.el: Regenerate.

* lisp/cedet/semantic/wisent/js-wy.el: Add missing copyright header

Suggested by Glenn Morris.

3 files changed, 7 insertions, 6 deletions

diff --git a/etc/grammars/wisent-grammar.el b/etc/grammars/wisent-grammar.el
index 2fbf6165100..59d58c28325 100644
--- a/etc/grammars/wisent-grammar.el
+++ b/etc/grammars/wisent-grammar.el
@@ -471,13 +471,13 @@ Menu items are appended to the common grammar menu.")
      "srecode/srt-wy")
     ("wisent-javascript-jv-wy.el"
      "semantic/wisent/js-wy"
-     "Copyright (C) 1998-2011, 2012 Ecma International"
+     "Copyright (C) 1998-2011, 2012 Ecma International."
      ,wisent-make-parsers--ecmascript-license)
     ("wisent-java-tags-wy.el"
      "semantic/wisent/javat-wy")
     ("wisent-python-wy.el"
      "semantic/wisent/python-wy"
-     "Copyright (C) 2001-2010 Python Software Foundation"
+     "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software Foundation; All Rights Reserved."
      ,wisent-make-parsers--python-license)))
 
 (defun wisent-make-parsers ()
diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el
index 00679bfd9e5..19c69ecb51b 100644
--- a/lisp/cedet/semantic/wisent/js-wy.el
+++ b/lisp/cedet/semantic/wisent/js-wy.el
@@ -1,6 +1,7 @@
 ;;; semantic/wisent/js-wy.el --- Generated parser support file
 
 ;; Copyright (C) 2005, 2009, 2010, 2011, 2012  Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Ecma International.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/cedet/semantic/wisent/python-wy.el b/lisp/cedet/semantic/wisent/python-wy.el
index 12f8bcea692..1cc9902e70f 100644
--- a/lisp/cedet/semantic/wisent/python-wy.el
+++ b/lisp/cedet/semantic/wisent/python-wy.el
@@ -1,7 +1,7 @@
 ;;; semantic/wisent/python-wy.el --- Generated parser support file
 
-;; Copyright (C) 2002, 2003, 2004, 2007, 2010, 2011, 2012
-;; Free Software Foundation, Inc.
+;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc.
+;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software Foundation; All Rights Reserved
 
 ;; This file is part of GNU Emacs.
 
@@ -19,7 +19,7 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-
+;;
 ;; This file was generated from etc/grammars/python.wy.
 ;; It is derived in part from the Python grammar, used under the
 ;; following license:
@@ -715,7 +715,7 @@
    '((parse-stream . wisent-parse-stream)))
   (setq semantic-parser-name "LALR"
         semantic--parse-table wisent-python-wy--parse-table
-        semantic-debug-parser-source "wisent-python.wy"
+        semantic-debug-parser-source "python.wy"
         semantic-flex-keywords-obarray wisent-python-wy--keyword-table
         semantic-lex-types-obarray wisent-python-wy--token-table)
   ;; Collect unmatched syntax lexical tokens