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

[Juri Linkov]

Index: emacs/lisp/emacs-lisp/derived.el
diff -c emacs/lisp/emacs-lisp/derived.el:1.13 
emacs/lisp/emacs-lisp/derived.el:1.14
*** emacs/lisp/emacs-lisp/derived.el:1.13       Mon Nov 14 23:05:53 2005
--- emacs/lisp/emacs-lisp/derived.el    Sun Dec  4 02:33:41 2005
***************
*** 200,211 ****
  No problems result if this variable is not bound.
  `add-hook' automatically binds it.  (This is true for all hook variables.)"
                       name)))
         (defvar ,map (make-sparse-keymap))
         ,(if declare-syntax
!           `(defvar ,syntax (make-syntax-table)))
         ,(if declare-abbrev
!           `(defvar ,abbrev
!              (progn (define-abbrev-table ',abbrev nil) ,abbrev)))
         (put ',child 'derived-mode-parent ',parent)
         ,(if group `(put ',child 'custom-mode-group ,group))
  
--- 200,218 ----
  No problems result if this variable is not bound.
  `add-hook' automatically binds it.  (This is true for all hook variables.)"
                       name)))
+        (unless (boundp ',map)
+        (put ',map 'definition-name ',child))
         (defvar ,map (make-sparse-keymap))
         ,(if declare-syntax
!           `(progn
!              (unless (boundp ',syntax)
!                (put ',syntax 'definition-name ',child))
!              (defvar ,syntax (make-syntax-table))))
         ,(if declare-abbrev
!           `(progn
!              (put ',abbrev 'definition-name ',child)
!              (defvar ,abbrev
!                (progn (define-abbrev-table ',abbrev nil) ,abbrev))))
         (put ',child 'derived-mode-parent ',parent)
         ,(if group `(put ',child 'custom-mode-group ,group))