[Emacs-diffs] /srv/bzr/emacs/trunk r110383: Move bovine-grammar and wisent-grammar into lisp/ directory.

[Chong Yidong]

------------------------------------------------------------
revno: 110383
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-06 22:18:35 +0800
message:
  Move bovine-grammar and wisent-grammar into lisp/ directory.
  
  * lisp/files.el (auto-mode-alist): Add .by and .wy (Semantic grammars).
  
  * cedet/semantic/bovine/grammar.el:
  * cedet/semantic/wisent/grammar.el: Move from admin/grammars.  Add
  autoloads for bovine-grammar-mode and wisent-grammar-mode.
renamed:
  admin/grammars/bovine-grammar.el => lisp/cedet/semantic/bovine/grammar.el
  admin/grammars/wisent-grammar.el => lisp/cedet/semantic/wisent/grammar.el
modified:
  admin/ChangeLog
  lisp/ChangeLog
  lisp/cedet/ChangeLog
  lisp/files.el
  lisp/cedet/semantic/bovine/grammar.el
  lisp/cedet/semantic/wisent/grammar.el

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2012-10-01 18:10:29 +0000
+++ b/admin/ChangeLog   2012-10-06 14:18:35 +0000
@@ -1,5 +1,10 @@
 2012-10-01  David Engster  <address@hidden>
 
+       * grammars/bovine-grammar.el:
+       * grammars/wisent-grammar.el: Move to lisp directory.
+
+2012-10-01  David Engster  <address@hidden>
+
        * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote):
        Remove.
         (bovine-grammar-expand-form): Test for emacs-major-version.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-06 12:55:09 +0000
+++ b/lisp/ChangeLog    2012-10-06 14:18:35 +0000
@@ -1,3 +1,7 @@
+2012-10-06  Chong Yidong  <address@hidden>
+
+       * files.el (auto-mode-alist): Add .by and .wy (Semantic grammars).
+
 2012-10-06  Ikumi Keita  <address@hidden>  (tiny change)
 
        * international/characters.el: Fix simple mistake ((car chars) ->

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2012-10-02 05:02:52 +0000
+++ b/lisp/cedet/ChangeLog      2012-10-06 14:18:35 +0000
@@ -1,3 +1,9 @@
+2012-10-06  Chong Yidong  <address@hidden>
+
+       * semantic/bovine/grammar.el:
+       * semantic/wisent/grammar.el: Move from admin/grammars.  Add
+       autoloads for bovine-grammar-mode and wisent-grammar-mode.
+
 2012-10-02  Chong Yidong  <address@hidden>
 
        * srecode.el, ede.el: Restore Version header.

=== renamed file 'admin/grammars/bovine-grammar.el' => 
'lisp/cedet/semantic/bovine/grammar.el'
--- a/admin/grammars/bovine-grammar.el  2012-10-01 18:10:29 +0000
+++ b/lisp/cedet/semantic/bovine/grammar.el     2012-10-06 14:18:35 +0000
@@ -1,4 +1,4 @@
-;;; bovine-grammar.el --- Bovine's input grammar mode
+;;; semantic/bovine/grammar.el --- Bovine's input grammar mode
 ;;
 ;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 ;;
@@ -413,18 +413,17 @@
        ""))))
 
 (defvar bovine-grammar-menu
-  '("BY Grammar"
-    )
+  '("BY Grammar")
   "BY mode specific grammar menu.
 Menu items are appended to the common grammar menu.")
 
+;;;###autoload
 (define-derived-mode bovine-grammar-mode semantic-grammar-mode "BY"
   "Major mode for editing Bovine grammars."
   (semantic-grammar-setup-menu bovine-grammar-menu)
   (semantic-install-function-overrides
    '((grammar-parsetable-builder . bovine-grammar-parsetable-builder)
-     (grammar-setupcode-builder  . bovine-grammar-setupcode-builder)
-     )))
+     (grammar-setupcode-builder  . bovine-grammar-setupcode-builder))))
 
 (add-to-list 'auto-mode-alist '("\\.by\\'" . bovine-grammar-mode))
 
@@ -444,8 +443,6 @@
     )
   "Semantic grammar macros used in bovine grammars.")
 
-(provide 'semantic/bovine/grammar)
-
 (defun bovine-make-parsers ()
   "Generate Emacs' built-in Bovine-based parser files."
   (interactive)
@@ -504,4 +501,6 @@
          (replace-match packagename nil nil nil 1)
          (save-buffer))))))
 
-;;; bovine-grammar.el ends here
+(provide 'semantic/bovine/grammar)
+
+;;; semantic/bovine/grammar.el ends here

=== renamed file 'admin/grammars/wisent-grammar.el' => 
'lisp/cedet/semantic/wisent/grammar.el'
--- a/admin/grammars/wisent-grammar.el  2012-10-01 18:10:29 +0000
+++ b/lisp/cedet/semantic/wisent/grammar.el     2012-10-06 14:18:35 +0000
@@ -1,4 +1,4 @@
-;;; wisent-grammar.el --- Wisent's input grammar mode
+;;; semantic/wisent/grammar.el --- Wisent's input grammar mode
 
 ;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 ;;
@@ -323,15 +323,13 @@
   "WY mode specific grammar menu.
 Menu items are appended to the common grammar menu.")
 
+;;;###autoload
 (define-derived-mode wisent-grammar-mode semantic-grammar-mode "WY"
   "Major mode for editing Wisent grammars."
   (semantic-grammar-setup-menu wisent-grammar-menu)
   (semantic-install-function-overrides
    '((grammar-parsetable-builder . wisent-grammar-parsetable-builder)
-     (grammar-setupcode-builder  . wisent-grammar-setupcode-builder)
-     )))
-
-(add-to-list 'auto-mode-alist '("\\.wy\\'" . wisent-grammar-mode))
+     (grammar-setupcode-builder  . wisent-grammar-setupcode-builder))))
 
 (defvar-mode-local wisent-grammar-mode semantic-grammar-macros
   '(
@@ -498,7 +496,7 @@
            (insert-file-contents filename)
            ;; Fix copyright header:
            (goto-char (point-min))
-           (when additional-copyright  
+           (when additional-copyright
              (re-search-forward "Copyright (C).*$")
              (insert "\n;; " additional-copyright))
            (re-search-forward "^;; Author:")
@@ -523,4 +521,6 @@
            (delete-trailing-whitespace)
            (write-region nil nil (expand-file-name filename))))))))
 
-;;; wisent-grammar.el ends here
+(provide 'semantic/wisent/grammar)
+
+;;; semantic/wisent/grammar.el ends here

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-10-05 07:38:05 +0000
+++ b/lisp/files.el     2012-10-06 14:18:35 +0000
@@ -2326,6 +2326,8 @@
      ("\\.js\\'" . javascript-mode)
      ("\\.json\\'" . javascript-mode)
      ("\\.[ds]?vh?\\'" . verilog-mode)
+     ("\\.by\\'" . bovine-grammar-mode)
+     ("\\.wy\\'" . wisent-grammar-mode)
      ;; .emacs or .gnus or .viper following a directory delimiter in
      ;; Unix, MSDOG or VMS syntax.
      ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode)