(only-global-abbrevs): Doc fix.

(edit-abbrevs-map): Define within defvar.
(quietly-read-abbrev-file): Doc fix.

2 files changed, 13 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 113dfe2cf4d..c9f70c9f4be 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-01  John Paul Wallington  <jpw@gnu.org>
+
+        * abbrev.el (only-global-abbrevs): Doc fix.
+        (edit-abbrevs-map): Define within defvar.
+        (quietly-read-abbrev-file): Doc fix.
+
 2004-07-31  Luc Teirlinck  <teirllm@auburn.edu>
 
         * novice.el (enable-command, disable-command): Doc fixes.
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 3be0014fd0e..3580c136948 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -29,7 +29,7 @@
 ;;; Code:
 
 (defcustom only-global-abbrevs nil
-  "*t means user plans to use global abbrevs only.
+  "Non-nil means user plans to use global abbrevs only.
 This makes the commands that normally define mode-specific abbrevs
 define global abbrevs instead."
   :type 'boolean
@@ -59,13 +59,12 @@ to enable or disable Abbrev mode in the current buffer."
   :group 'abbrev-mode)
 
 
-(defvar edit-abbrevs-map nil
+(defvar edit-abbrevs-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-x\C-s" 'edit-abbrevs-redefine)
+    (define-key map "\C-c\C-c" 'edit-abbrevs-redefine)
+    map)
   "Keymap used in `edit-abbrevs'.")
-(if edit-abbrevs-map
-    nil
-  (setq edit-abbrevs-map (make-sparse-keymap))
-  (define-key edit-abbrevs-map "\C-x\C-s" 'edit-abbrevs-redefine)
-  (define-key edit-abbrevs-map "\C-c\C-c" 'edit-abbrevs-redefine))
 
 (defun kill-all-abbrevs ()
   "Undefine all defined abbrevs."
@@ -195,7 +194,7 @@ Optional second argument QUIETLY non-nil means don't display a message."
   (setq abbrevs-changed nil))
 
 (defun quietly-read-abbrev-file (&optional file)
-  "Read abbrev definitions from file written with write-abbrev-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 display any message."