[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100355: Abbrev.el fix for bug #7733. (tiny change)

[Glenn Morris]

------------------------------------------------------------
revno: 100355
author: Brent Goodrick <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Sun 2011-01-02 22:13:35 -0800
message:
  Abbrev.el fix for bug #7733.  (tiny change)
  
  * lisp/abbrev.el (prepare-abbrev-list-buffer): If listing local abbrev
  table, get the value before switching to the output buffer.
modified:
  lisp/ChangeLog
  lisp/abbrev.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-03 03:49:13 +0000
+++ b/lisp/ChangeLog    2011-01-03 06:13:35 +0000
@@ -1,3 +1,8 @@
+2011-01-03  Brent Goodrick  <address@hidden>
+
+       * abbrev.el (prepare-abbrev-list-buffer): If listing local abbrev
+       table, get the value before switching to the output buffer.  (Bug#7733)
+
 2011-01-03  Stefan Monnier  <address@hidden>
 
        * progmodes/python.el (python-mode): Don't impose font-lock (bug#3628).

=== modified file 'lisp/abbrev.el'
--- a/lisp/abbrev.el    2011-01-02 23:50:46 +0000
+++ b/lisp/abbrev.el    2011-01-03 06:13:35 +0000
@@ -125,17 +125,18 @@
     found))
 
 (defun prepare-abbrev-list-buffer (&optional local)
-  (with-current-buffer (get-buffer-create "*Abbrevs*")
-    (erase-buffer)
-    (if local
-        (insert-abbrev-table-description
-         (abbrev-table-name local-abbrev-table) t)
-      (dolist (table abbrev-table-name-list)
-        (insert-abbrev-table-description table t)))
-    (goto-char (point-min))
-    (set-buffer-modified-p nil)
-    (edit-abbrevs-mode)
-    (current-buffer)))
+  (let ((local-table local-abbrev-table))
+    (with-current-buffer (get-buffer-create "*Abbrevs*")
+      (erase-buffer)
+      (if local
+          (insert-abbrev-table-description
+           (abbrev-table-name local-table) t)
+        (dolist (table abbrev-table-name-list)
+          (insert-abbrev-table-description table t)))
+      (goto-char (point-min))
+      (set-buffer-modified-p nil)
+      (edit-abbrevs-mode)
+      (current-buffer))))
 
 (defun edit-abbrevs-mode ()
   "Major mode for editing the list of abbrev definitions.