[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/derived.el

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/derived.el
diff -c emacs/lisp/emacs-lisp/derived.el:1.6 
emacs/lisp/emacs-lisp/derived.el:1.7
*** emacs/lisp/emacs-lisp/derived.el:1.6        Sat May 21 22:35:35 2005
--- emacs/lisp/emacs-lisp/derived.el    Sun Jun 12 16:57:08 2005
***************
*** 1,5 ****
  ;;; derived.el --- allow inheritance of major modes
! ;;; (formerly mode-clone.el)
  
  ;; Copyright (C) 1993, 1994, 1999, 2003 Free Software Foundation, Inc.
  
--- 1,5 ----
  ;;; derived.el --- allow inheritance of major modes
! ;; (formerly mode-clone.el)
  
  ;; Copyright (C) 1993, 1994, 1999, 2003 Free Software Foundation, Inc.
  
***************
*** 221,226 ****
--- 221,232 ----
                         (get (quote ,parent) 'mode-class)))
                                        ; Set up maps and tables.
                (unless (keymap-parent ,map)
+                   ;; It would probably be better to set the keymap's parent
+                   ;; at the toplevel rather than inside the mode function,
+                   ;; but this is not easy for at least the following reasons:
+                   ;; - the parent (and its keymap) may not yet be loaded.
+                   ;; - the parent's keymap name may be called something else
+                   ;;   than <parent>-mode-map.
                  (set-keymap-parent ,map (current-local-map)))
                ,(when declare-syntax
                   `(let ((parent (char-table-parent ,syntax)))
***************
*** 440,444 ****
  
  (provide 'derived)
  
! ;;; arch-tag: 630be248-47d1-4f02-afa0-8207de0ebea0
  ;;; derived.el ends here
--- 446,450 ----
  
  (provide 'derived)
  
! ;; arch-tag: 630be248-47d1-4f02-afa0-8207de0ebea0
  ;;; derived.el ends here