[Emacs-diffs] emacs/lisp ChangeLog minibuffer.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/11/10 00:54:48

Modified files:
        lisp           : ChangeLog minibuffer.el 

Log message:
        (read-file-name): Support a list of default values
        in `default-filename'.  Use the first file name where only one
        element is required.  Doc fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16588&r2=1.16589
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/minibuffer.el?cvsroot=emacs&r1=1.93&r2=1.94

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16588
retrieving revision 1.16589
diff -u -b -r1.16588 -r1.16589
--- ChangeLog   10 Nov 2009 00:07:41 -0000      1.16588
+++ ChangeLog   10 Nov 2009 00:54:45 -0000      1.16589
@@ -1,3 +1,9 @@
+2009-11-10  Juri Linkov  <address@hidden>
+
+       * minibuffer.el (read-file-name): Support a list of default values
+       in `default-filename'.  Use the first file name where only one
+       element is required.  Doc fix.
+
 2009-11-09  Michael Albinus  <address@hidden>
 
        * net/dbus.el (dbus-unregister-object): Release service, if no

Index: minibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- minibuffer.el       2 Nov 2009 02:06:40 -0000       1.93
+++ minibuffer.el       10 Nov 2009 00:54:48 -0000      1.94
@@ -1265,7 +1265,8 @@
 Default name to DEFAULT-FILENAME if user exits the minibuffer with
 the same non-empty string that was inserted by this function.
  (If DEFAULT-FILENAME is omitted, the visited file name is used,
-  except that if INITIAL is specified, that combined with DIR is used.)
+  except that if INITIAL is specified, that combined with DIR is used.
+  If DEFAULT-FILENAME is a list of file names, the first file name is used.)
 If the user exits with an empty minibuffer, this function returns
 an empty string.  (This can only happen if the user erased the
 pre-inserted contents or if `insert-default-directory' is nil.)
@@ -1308,7 +1309,10 @@
   (setq dir (abbreviate-file-name dir))
   ;; Likewise for default-filename.
   (if default-filename
-      (setq default-filename (abbreviate-file-name default-filename)))
+      (setq default-filename
+           (if (consp default-filename)
+               (mapcar 'abbreviate-file-name default-filename)
+             (abbreviate-file-name default-filename))))
   (let ((insdef (cond
                  ((and insert-default-directory (stringp dir))
                   (if initial
@@ -1357,9 +1361,12 @@
                               (not (zerop (length file))))
                       (setq default-filename file)
                       (setq dir (file-name-directory dir)))
-                    (if default-filename
+                    (when default-filename
                         (setq default-filename
-                              (expand-file-name default-filename dir)))
+                           (expand-file-name (if (consp default-filename)
+                                                 (car default-filename)
+                                               default-filename)
+                                             dir)))
                     (setq add-to-history t)
                     (x-file-dialog prompt dir default-filename
                                   dialog-mustmatch
@@ -1371,6 +1378,8 @@
           ;; it has to mean that the user typed RET with the minibuffer empty.
           ;; In that case, we really want to return ""
           ;; so that commands such as set-visited-file-name can distinguish.
+         (when (consp default-filename)
+           (setq default-filename (car default-filename)))
           (when (eq val default-filename)
             ;; In this case, completing-read has not added an element
             ;; to the history.  Maybe we should.