(lm-with-file): Use mode and syntax table for Emacs Lisp, not Lisp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e40ec1863e5b95559d22e799ff20d6ebbc2db023..ddc9e229f80d8bbe497ed234117809c8e124adae 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-26  Johan Bockg\e$(Q)[\e(Brd  <bojohan@gnu.org>
+
+       * emacs-lisp/lisp-mnt.el (lm-with-file): Use mode and syntax table
+       for Emacs Lisp, not Lisp.
+
 2008-03-26  Juanma Barranquero  <lekktu@gmail.com>
 
        * emacs-lisp/bytecomp.el (byte-compile-obsolete): If no

diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index ce0bc2c9d86821e1ddf09fcb867b04ec67fbfdb4..fa457acec966adb623697d57d1bc35cf59105551 100644 (file)
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -37,7 +37,8 @@
 ;; Another entry point automatically addresses bug mail to a package's
 ;; maintainer or author.
 
-;; This file can be loaded by your lisp-mode-hook.  Have it (require 'lisp-mnt)
+;; This file can be loaded by your emacs-lisp-mode-hook.  Have it
+;; (require 'lisp-mnt)
 
 ;; This file is an example of the header conventions.  Note the following
 ;; features:
@@ -305,12 +306,12 @@ If FILE is nil, execute BODY in the current buffer."
        (if ,filesym
           (with-temp-buffer
             (insert-file-contents ,filesym)
-            (lisp-mode)
+            (emacs-lisp-mode)
             ,@body)
         (save-excursion
           ;; Switching major modes is too drastic, so just switch
-          ;; temporarily to the Lisp mode syntax table.
-          (with-syntax-table lisp-mode-syntax-table
+          ;; temporarily to the Emacs Lisp mode syntax table.
+          (with-syntax-table emacs-lisp-mode-syntax-table
             ,@body))))))
 
 (put 'lm-with-file 'lisp-indent-function 1)