From: Reiner Steib <Reiner.Steib@gmx.de>
Date: Tue, 18 Apr 2006 22:04:27 +0000 (+0000)
Subject: (read-abbrev-file): Use abbrev-file-name if optional
X-Git-Tag: emacs-pretest-22.0.90~3064
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec7793c3a6c246f4f3f2508681d22c00115e7ae0;p=emacs.git

(read-abbrev-file): Use abbrev-file-name if optional
file is nil.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab15b6dce76..b0f52fb9ff4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-19  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* abbrev.el (read-abbrev-file): Use abbrev-file-name if optional
+	file is nil.
+
 2006-04-18  Richard Stallman  <rms@gnu.org>
 
 	* tooltip.el (tooltip-mode, tooltip-use-echo-area): Doc fixes.
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 0c9cdfa2228..9ba53f6f6f5 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -202,7 +202,7 @@ Optional second argument QUIETLY non-nil means don't display a message."
     (read-file-name (format "Read abbrev file (default %s): "
 			    abbrev-file-name)
 		    nil abbrev-file-name t)))
-  (load file nil quietly)
+  (load (or file abbrev-file-name) nil quietly)
   (setq abbrevs-changed nil))
 
 (defun quietly-read-abbrev-file (&optional file)