*** empty log message ***

[gnu-emacs] / lisp / abbrev.el

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 5cb4cc968388936eb3db51d565d262f47b3c2275..ab0f715d27278b98985030a9c277f5fba07586d4 100644 (file)
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
 
+;; Maintainer: FSF
 ;; Keywords: abbrev convenience
 
 ;; This file is part of GNU Emacs.
@@ -50,7 +51,6 @@ and be replaced by its expansion."
   "Toggle abbrev mode.
 Non-nil means automatically expand abbrevs as they are inserted.
 
-This variable automatically becomes buffer-local when set in any fashion.
 Changing it with \\[customize] sets the default value.
 Use the command `abbrev-mode' to enable or disable Abbrev mode in the current
 buffer."
@@ -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.
@@ -175,17 +175,17 @@ the ones defined from the buffer now."
   "Read abbrev definitions from file written with `write-abbrev-file'.
 Optional argument FILE is the name of the file to read;
 it defaults to the value of `abbrev-file-name'.
-Optional second argument QUIETLY non-nil means don't print anything."
+Optional second argument QUIETLY non-nil means don't display a message."
   (interactive "fRead abbrev file: ")
   (load (if (and file (> (length file) 0)) file abbrev-file-name)
        nil quietly)
-  (setq save-abbrevs t abbrevs-changed nil))
+  (setq abbrevs-changed nil))
 
 (defun quietly-read-abbrev-file (&optional file)
   "Read abbrev definitions from file written with write-abbrev-file.
 Optional argument FILE is the name of the file to read;
 it defaults to the value of `abbrev-file-name'.
-Does not print anything."
+Does not display any message."
   ;(interactive "fRead abbrev file: ")
   (read-abbrev-file file t))