[Emacs-diffs] /srv/bzr/emacs/trunk r104853: * lisp/emacs-lisp/derived.el (define-derived-mode): Make abbrev-table

[Stefan Monnier]

------------------------------------------------------------
revno: 104853
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-01 12:41:02 -0400
message:
  * lisp/emacs-lisp/derived.el (define-derived-mode): Make abbrev-table
  inherit from parent.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/derived.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-01 13:37:00 +0000
+++ b/lisp/ChangeLog    2011-07-01 16:41:02 +0000
@@ -1,3 +1,8 @@
+2011-07-01  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/derived.el (define-derived-mode): Make abbrev-table
+       inherit from parent.
+
 2011-07-01  Lars Magne Ingebrigtsen  <address@hidden>
 
        * dired-aux.el (dired-diff): Doc fixup (bug#8816).

=== modified file 'lisp/emacs-lisp/derived.el'
--- a/lisp/emacs-lisp/derived.el        2011-03-22 20:58:27 +0000
+++ b/lisp/emacs-lisp/derived.el        2011-07-01 16:41:02 +0000
@@ -253,8 +253,11 @@
                   `(let ((parent (char-table-parent ,syntax)))
                      (unless (and parent
                                   (not (eq parent (standard-syntax-table))))
-                       (set-char-table-parent ,syntax (syntax-table)))))))
-
+                       (set-char-table-parent ,syntax (syntax-table)))))
+                ,(when declare-abbrev
+                   `(unless (abbrev-table-get ,abbrev :parents)
+                      (abbrev-table-put ,abbrev :parents
+                                        (list local-abbrev-table))))))
          (use-local-map ,map)
          ,(when syntax `(set-syntax-table ,syntax))
          ,(when abbrev `(setq local-abbrev-table ,abbrev))