summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorBrent Goodrick <bgoodr@gmail.com>2011-01-02 22:13:35 -0800
committerGlenn Morris <rgm@gnu.org>2011-01-02 22:13:35 -0800
commit8d4708aff01e3ae30119bb7166cdf8517fbfa1a9 (patch)
tree8b067572eedff93b106095451499d30f3b054ada /lisp
parent364df1cc7641e6787c09f83789c7f5f5bc5a6140 (diff)
downloademacs-8d4708aff01e3ae30119bb7166cdf8517fbfa1a9.tar.gz
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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/abbrev.el23
2 files changed, 17 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f522ff4b06..751049488ea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-03 Brent Goodrick <bgoodr@gmail.com>
+
+ * 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 <monnier@iro.umontreal.ca>
* progmodes/python.el (python-mode): Don't impose font-lock (bug#3628).
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 779787e0d7d..4ce4d82c7c2 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -125,17 +125,18 @@ Otherwise display all abbrevs."
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.