* minibuffer.el (read-file-name): Don't use file dialogs for

remote directories (Bug#99).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c92b7b507a03a8c7201dffebaecf707aa15e542..88b6a6ab98db7facf23be550b9106d91e1d64a1c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-02  Chong Yidong  <cyd@stupidchicken.com>
+
+       * minibuffer.el (read-file-name): Don't use file dialogs for
+       remote directories (Bug#99).
+
 2009-11-01  Chong Yidong  <cyd@stupidchicken.com>
 
        * progmodes/sh-script.el (sh-font-lock-paren): Fix last change.

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 783e219199b44f66388215cd8eddf5f775393ccd..59732fd4b8af839abe5b9de308dbda3967ca0d75 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1292,9 +1292,10 @@ DIR should be an absolute directory name.  It defaults to the value of
 
 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 @@ and `read-file-name-function'."
             (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