(prepare-abbrev-list-buffer): Get the value of

local-abbrev-table before changing buffers because it might
have a buffer-local binding.

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 5cb4cc968388936eb3db51d565d262f47b3c2275..b2cf747fca074b099019b64f5939f52f429c0205 100644 (file)
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -106,17 +106,17 @@ Otherwise display all abbrevs."
     
 (defun prepare-abbrev-list-buffer (&optional local)
   (save-excursion
-    (set-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 ((table local-abbrev-table))
+      (set-buffer (get-buffer-create "*Abbrevs*"))
+      (erase-buffer)
+      (if local
+         (insert-abbrev-table-description (abbrev-table-name 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.