* lisp/emacs-lisp/derived.el (define-derived-mode): Make abbrev-table

inherit from parent.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4167d86f9723038e37213c6f48dc82278ebb7765..2bb0bad7282597791cbb7caf2d4457503b169aa1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/derived.el (define-derived-mode): Make abbrev-table
+       inherit from parent.
+
 2011-07-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * dired-aux.el (dired-diff): Doc fixup (bug#8816).

diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 1db98ac39c8ba67ccefcdf239f1db68518921e0b..e8f799b9afcb3208d61c08d5375d9508e675eca7 100644 (file)
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -253,8 +253,11 @@ No problems result if this variable is not bound.
                   `(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))