Add 2012 to FSF copyright years for Emacs files

[bpt/emacs.git] / lisp / cedet / semantic / ede-grammar.el

diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el
index e0162f5..0fc1829 100644 (file)
--- a/lisp/cedet/semantic/ede-grammar.el
+++ b/lisp/cedet/semantic/ede-grammar.el
@@ -1,6 +1,6 @@
 ;;; semantic/ede-grammar.el --- EDE support for Semantic Grammar Files
 
-;;;  Copyright (C) 2003, 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2007-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
@@ -71,8 +71,8 @@ parsing different languages.")
      "@for loadpath in . ${LOADPATH}; do \\"
      "   echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\"
      "done;"
-     "@echo \"(require 'semantic-load)\" >> grammar-make-script"
-     "@echo \"(require 'semantic-grammar)\" >> grammar-make-script"
+     "@echo \"(require 'semantic/load)\" >> grammar-make-script"
+     "@echo \"(require 'semantic/grammar)\" >> grammar-make-script"
      ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script"
      "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^"
      )
@@ -101,8 +101,8 @@ parsing different languages.")
      "@for loadpath in . ${LOADPATH}; do \\"
      "   echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\"
      "done;"
-     "@echo \"(require 'semantic-load)\" >> grammar-make-script"
-     "@echo \"(require 'semantic-grammar)\" >> grammar-make-script"
+     "@echo \"(require 'semantic/load)\" >> grammar-make-script"
+     "@echo \"(require 'semantic/grammar)\" >> grammar-make-script"
      ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script"
      "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^"
      )
@@ -129,16 +129,12 @@ Lays claim to all -by.el, and -wy.el files."
         (proj (ede-target-parent obj))
         (default-directory (oref proj directory)))
     (mapc (lambda (src)
-           (save-excursion
-             (set-buffer (find-file-noselect src))
+           (with-current-buffer (find-file-noselect src)
              (save-excursion
                (semantic-grammar-create-package))
              (save-buffer)
-             (let ((cf (concat (semantic-grammar-package) ".el")))
-               (if (or (not (file-exists-p cf))
-                       (file-newer-than-file-p src cf))
-                   (byte-compile-file cf)))))
-           (oref obj source)))
+              (byte-recompile-file (concat (semantic-grammar-package) ".el") nil 0)))
+         (oref obj source)))
   (message "All Semantic Grammar sources are up to date in %s" (object-name obj)))
 
 ;;; Makefile generation functions
@@ -162,8 +158,7 @@ Lays claim to all -by.el, and -wy.el files."
       (concat (ede-pmake-varname this) "_SEMANTIC_GRAMMAR_EL")
     (insert
      (mapconcat (lambda (src)
-                 (save-excursion
-                   (set-buffer (find-file-noselect src))
+                 (with-current-buffer (find-file-noselect src)
                    (concat (semantic-grammar-package) ".el")))
                (oref this source)
                " ")))
@@ -199,5 +194,4 @@ Argument THIS is the target that should insert stuff."
 
 (provide 'semantic/ede-grammar)
 
-;; arch-tag: 37a06a8d-957a-4fa2-a931-38482d28c24a
 ;;; semantic/ede-grammar.el ends here