# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1145394973 0
# Node ID 4427f1e01f3e43740460698e3f5f4c765cc18c85
# Parent  67a078792729814c37a5af3885a3f0d64905ffa3
(edit-abbrevs-redefine): Temporarily widen.
(read-abbrev-file): Provide default when reading filename.

diff -r 67a078792729 -r 4427f1e01f3e lisp/abbrev.el
--- a/lisp/abbrev.el	Tue Apr 18 21:10:14 2006 +0000
+++ b/lisp/abbrev.el	Tue Apr 18 21:16:13 2006 +0000
@@ -160,8 +160,10 @@
 (defun edit-abbrevs-redefine ()
   "Redefine abbrevs according to current buffer contents."
   (interactive)
-  (define-abbrevs t)
-  (set-buffer-modified-p nil))
+  (save-restriction
+    (widen)
+    (define-abbrevs t)
+    (set-buffer-modified-p nil)))
 
 (defun define-abbrevs (&optional arg)
   "Define abbrevs according to current visible buffer contents.
@@ -195,9 +197,12 @@
 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 display a message."
-  (interactive "fRead abbrev file: ")
-  (load (if (and file (> (length file) 0)) file abbrev-file-name)
-	nil quietly)
+  (interactive
+   (list
+    (read-file-name (format "Read abbrev file (default %s): "
+			    abbrev-file-name)
+		    nil abbrev-file-name t)))
+  (load file nil quietly)
   (setq abbrevs-changed nil))
 
 (defun quietly-read-abbrev-file (&optional file)