(read-abbrev-file): Use abbrev-file-name if optional

file is nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab15b6dce7631260546f42b0362f7326173c30ae..b0f52fb9ff48ae7f30499fe49e59a71cec1d65e8 100644 (file)
--- 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 0c9cdfa22285d82ae94a3fe5580417cf543d06a9..9ba53f6f6f580c7bbe3aa92211d9a9e56515ac6c 100644 (file)
--- 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)