From: Chong Yidong <cyd@gnu.org>
Date: Sun, 29 Jan 2012 04:45:51 +0000 (+0800)
Subject: Make Emacs Lisp mode use emacs-lisp-mode-abbrev-table.
X-Git-Tag: emacs-pretest-24.0.93~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db17443466147411261b559458fa6e8df6587d12;p=emacs.git

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.

Fixes: debbugs:9360
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e7a09b7b208..e74adea65e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-29  Chong Yidong  <cyd@gnu.org>
+
+	* 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  <winkler@gnu.org>
 
 	* textmodes/bibtex.el (bibtex-vec-incr): Fix docstring.
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 3d581e26758..95eb8c963be 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -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 @@ score-mode.el.  KEYWORDS-CASE-INSENSITIVE non-nil means that for
 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 @@ Semicolons start comments.
 
 \\{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.