Merge from emacs-23

[gnu-emacs] / lisp / emacs-lisp / derived.el

diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 36298e47a728610afe12ef15ab8490493fc4c737..7936bc67af5b99614428e74ce23b7ce7d6c492ae 100644 (file)
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -7,6 +7,7 @@
 ;; Author: David Megginson (dmeggins@aix1.uottawa.ca)
 ;; Maintainer: FSF
 ;; Keywords: extensions
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -230,7 +231,7 @@ No problems result if this variable is not bound.
                                        ; Run the parent.
         (delay-mode-hooks
 
-         (,(or parent 'kill-all-local-variables))
+         (,(or parent 'fundamental-mode))
                                        ; Identify the child mode.
          (setq major-mode (quote ,child))
          (setq mode-name ,name)