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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/11/02 02:06:40

Modified files:
        lisp           : ChangeLog minibuffer.el 

Log message:
        * minibuffer.el (read-file-name): Don't use file dialogs for
        remote directories (Bug#99).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16541&r2=1.16542
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/minibuffer.el?cvsroot=emacs&r1=1.92&r2=1.93

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16541
retrieving revision 1.16542
diff -u -b -r1.16541 -r1.16542
--- ChangeLog   1 Nov 2009 17:44:04 -0000       1.16541
+++ ChangeLog   2 Nov 2009 02:06:36 -0000       1.16542
@@ -1,3 +1,8 @@
+2009-11-02  Chong Yidong  <address@hidden>
+
+       * minibuffer.el (read-file-name): Don't use file dialogs for
+       remote directories (Bug#99).
+
 2009-11-01  Chong Yidong  <address@hidden>
 
        * progmodes/sh-script.el (sh-font-lock-paren): Fix last change.

Index: minibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- minibuffer.el       26 Oct 2009 03:39:19 -0000      1.92
+++ minibuffer.el       2 Nov 2009 02:06:40 -0000       1.93
@@ -1292,9 +1292,10 @@
 
 If this command was invoked with the mouse, use a graphical file
 dialog if `use-dialog-box' is non-nil, and the window system or X
-toolkit in use provides a file dialog box.  For graphical file
-dialogs, any the special values of MUSTMATCH; `confirm' and
-`confirm-after-completion' are treated as equivalent to nil.
+toolkit in use provides a file dialog box, and DIR is not a
+remote file.  For graphical file dialogs, any the special values
+of MUSTMATCH; `confirm' and `confirm-after-completion' are
+treated as equivalent to nil.
 
 See also `read-file-name-completion-ignore-case'
 and `read-file-name-function'."
@@ -1325,7 +1326,10 @@
             (add-to-history nil))
 
         (let* ((val
-                (if (not (next-read-file-uses-dialog-p))
+                (if (or (not (next-read-file-uses-dialog-p))
+                       ;; Graphical file dialogs can't handle remote
+                       ;; files (Bug#99).
+                       (file-remote-p dir))
                     ;; We used to pass `dir' to `read-file-name-internal' by
                     ;; abusing the `predicate' argument.  It's better to
                     ;; just use `default-directory', but in order to avoid