[Emacs-diffs] /srv/bzr/emacs/trunk r106993: Make Emacs Lisp mode use emacs-lisp-mode-abbrev-table.

[Chong Yidong]

------------------------------------------------------------
revno: 106993
fixes bug(s): http://debbugs.gnu.org/9360
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-01-29 12:45:51 +0800
message:
  Make Emacs Lisp mode use emacs-lisp-mode-abbrev-table.
  
  * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-mode-abbrev-table): Define
  and use in Emacs Lisp mode.
  (lisp-mode-abbrev-table): Add doc.
  (lisp-mode-variables): Don't set local-abbrev-table.
  (lisp-interaction-mode): Use emacs-lisp-mode-abbrev-table.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/lisp-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-28 18:25:03 +0000
+++ b/lisp/ChangeLog    2012-01-29 04:45:51 +0000
@@ -1,3 +1,11 @@
+2012-01-29  Chong Yidong  <address@hidden>
+
+       * emacs-lisp/lisp-mode.el (emacs-lisp-mode-abbrev-table): Define
+       and use in Emacs Lisp mode (Bug#9360).
+       (lisp-mode-abbrev-table): Add doc.
+       (lisp-mode-variables): Don't set local-abbrev-table.
+       (lisp-interaction-mode): Use emacs-lisp-mode-abbrev-table.
+
 2012-01-28  Roland Winkler  <address@hidden>
 
        * textmodes/bibtex.el (bibtex-vec-incr): Fix docstring.

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el      2012-01-19 07:21:25 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el      2012-01-29 04:45:51 +0000
@@ -34,8 +34,14 @@
 (defvar font-lock-string-face)
 
 (defvar lisp-mode-abbrev-table nil)
+(define-abbrev-table 'lisp-mode-abbrev-table ()
+  "Abbrev table for Lisp mode.")
 
-(define-abbrev-table 'lisp-mode-abbrev-table ())
+(defvar emacs-lisp-mode-abbrev-table nil)
+(define-abbrev-table 'emacs-lisp-mode-abbrev-table ()
+  "Abbrev table for Emacs Lisp mode.
+It has `lisp-mode-abbrev-table' as its parent."
+  :parents (list lisp-mode-abbrev-table))
 
 (defvar emacs-lisp-mode-syntax-table
   (let ((table (make-syntax-table))
@@ -206,7 +212,6 @@
 font-lock keywords will not be case sensitive."
   (when lisp-syntax
     (set-syntax-table lisp-mode-syntax-table))
-  (setq local-abbrev-table lisp-mode-abbrev-table)
   (make-local-variable 'paragraph-ignore-fill-prefix)
   (setq paragraph-ignore-fill-prefix t)
   (make-local-variable 'fill-paragraph-function)
@@ -540,7 +545,8 @@
 
 \\{lisp-interaction-mode-map}
 Entry to this mode calls the value of `lisp-interaction-mode-hook'
-if that value is non-nil.")
+if that value is non-nil."
+  :abbrev-table nil)
 
 (defun eval-print-last-sexp ()
   "Evaluate sexp before point; print value into current buffer.