# HG changeset patch
# User Reiner Steib <Reiner.Steib@gmx.de>
# Date 1145397867 0
# Node ID 2ae2af9725335e7c4f28f6728fcd008053cd000e
# Parent  ceac9912f828cf3549a2512348707e36a14c7469
(read-abbrev-file): Use abbrev-file-name if optional
file is nil.

diff -r ceac9912f828 -r 2ae2af972533 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Apr 18 21:29:03 2006 +0000
+++ b/lisp/ChangeLog	Tue Apr 18 22:04:27 2006 +0000
@@ -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 -r ceac9912f828 -r 2ae2af972533 lisp/abbrev.el
--- a/lisp/abbrev.el	Tue Apr 18 21:29:03 2006 +0000
+++ b/lisp/abbrev.el	Tue Apr 18 22:04:27 2006 +0000
@@ -202,7 +202,7 @@
     (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)