aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrent Goodrick2011-01-02 22:13:35 -0800
committerGlenn Morris2011-01-02 22:13:35 -0800
commit8d4708aff01e3ae30119bb7166cdf8517fbfa1a9 (patch)
tree8b067572eedff93b106095451499d30f3b054ada
parent364df1cc7641e6787c09f83789c7f5f5bc5a6140 (diff)
downloademacs-8d4708aff01e3ae30119bb7166cdf8517fbfa1a9.tar.gz
emacs-8d4708aff01e3ae30119bb7166cdf8517fbfa1a9.zip
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.
-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 @@
12011-01-03 Brent Goodrick <bgoodr@gmail.com>
2
3 * abbrev.el (prepare-abbrev-list-buffer): If listing local abbrev
4 table, get the value before switching to the output buffer. (Bug#7733)
5
12011-01-03 Stefan Monnier <monnier@iro.umontreal.ca> 62011-01-03 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * progmodes/python.el (python-mode): Don't impose font-lock (bug#3628). 8 * 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."
125 found)) 125 found))
126 126
127(defun prepare-abbrev-list-buffer (&optional local) 127(defun prepare-abbrev-list-buffer (&optional local)
128 (with-current-buffer (get-buffer-create "*Abbrevs*") 128 (let ((local-table local-abbrev-table))
129 (erase-buffer) 129 (with-current-buffer (get-buffer-create "*Abbrevs*")
130 (if local 130 (erase-buffer)
131 (insert-abbrev-table-description 131 (if local
132 (abbrev-table-name local-abbrev-table) t) 132 (insert-abbrev-table-description
133 (dolist (table abbrev-table-name-list) 133 (abbrev-table-name local-table) t)
134 (insert-abbrev-table-description table t))) 134 (dolist (table abbrev-table-name-list)
135 (goto-char (point-min)) 135 (insert-abbrev-table-description table t)))
136 (set-buffer-modified-p nil) 136 (goto-char (point-min))
137 (edit-abbrevs-mode) 137 (set-buffer-modified-p nil)
138 (current-buffer))) 138 (edit-abbrevs-mode)
139 (current-buffer))))
139 140
140(defun edit-abbrevs-mode () 141(defun edit-abbrevs-mode ()
141 "Major mode for editing the list of abbrev definitions. 142 "Major mode for editing the list of abbrev definitions.