* semantic/ede-grammar.el (project-compile-target): Fix grammar

  compilation after introduction of %provide statement.

2 files changed, 9 insertions, 6 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 524eec4ad5f..453939e6ce1 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,5 +1,10 @@
 2012-10-07  David Engster  <deng@randomsample.de>
 
+        * semantic/ede-grammar.el (project-compile-target): Fix grammar
+        compilation after introduction of %provide statement.
+
+2012-10-07  David Engster  <deng@randomsample.de>
+
         * semantic.el (semantic-new-buffer-setup-functions): Remove setup
         function for `f90-mode', since the parser only exists upstream.
 
diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el
index c92fcabecb1..16cf0ca96a2 100644
--- a/lisp/cedet/semantic/ede-grammar.el
+++ b/lisp/cedet/semantic/ede-grammar.el
@@ -143,12 +143,10 @@ Lays claim to all -by.el, and -wy.el files."
          (utd 0))
     (mapc (lambda (src)
             (with-current-buffer (find-file-noselect src)
-              (save-excursion
-                (semantic-grammar-create-package))
-              ;; After compile, the current buffer is the compiled grammar.
-              ;; Save and compile it.
-              (save-buffer)
-              (let* ((src (buffer-file-name))
+              (let* ((package (semantic-grammar-create-package))
+                     (fname (progn (string-match ".*/\\(.+\\.el\\)" package)
+                                   (match-string 1 package)))
+                     (src (with-current-buffer fname (buffer-file-name)))
                      (csrc (concat (file-name-sans-extension src) ".elc")))
                 (if (< emacs-major-version 24)
                     ;; Does not have `byte-recompile-file'