1 files changed, 7 insertions, 2 deletions

diff --git a/lisp/cedet/semantic/bovine/grammar.el b/lisp/cedet/semantic/bovine/grammar.el
index 0eab01b58b1..65c856a8cae 100644
--- a/lisp/cedet/semantic/bovine/grammar.el
+++ b/lisp/cedet/semantic/bovine/grammar.el
@@ -475,6 +475,7 @@ Menu items are appended to the common grammar menu.")
          ;; This is with-demoted-errors.
          (condition-case err
              (with-current-buffer (find-file-noselect infile)
+               (setq infile buffer-file-name)
                (if outdir (setq default-directory outdir))
                (semantic-grammar-create-package nil t))
            (error (message "%s" (error-message-string err)) nil)))
@@ -509,8 +510,12 @@ Menu items are appended to the common grammar menu.")
 
 ;;; Commentary:
 ;;
-;; This file was generated from admin/grammars/"
-                lang ".by.
+;; This file was generated from "
+                (if (string-match "\\(OFFadmin/grammars/.*\\.by\\)\\'" infile)
+                    (match-string 1 infile)
+                  (concat "admin/grammars/"
+                          (if (string-equal lang "scm") "scheme" lang) ".by"))
+".
 
 ;;; Code:
 ")