* net/ange-ftp.el (ange-ftp-canonize-filename): Check, that

`default-directory' is non-nil.

* net/ange-ftp.el (ange-ftp-canonize-filename): Check, that
`default-directory' is non-nil.
4372494f · Drew Adams · Michael Albinus · 4d4ec1f8 · 4372494f · 4372494f
Commit 4372494f authored Jan 28, 2012 by Drew Adams Committed by Michael Albinus Jan 28, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +5 -0

lisp/net/ange-ftp.el lisp/net/ange-ftp.el +2 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+2012-01-28  Drew Adams  <drew.adams@oracle.com>
+
+	* net/ange-ftp.el (ange-ftp-canonize-filename): Check, that
+	`default-directory' is non-nil.
+
 2012-01-28  Eli Zaretskii  <eliz@gnu.org>

 	* mail/emacsbug.el (report-emacs-bug): Fill the potentially long

--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -3098,7 +3098,8 @@ logged in as user USER and cd'd to directory DIR."
            (if (not (eq system-type 'windows-nt))
                (setq name (ange-ftp-real-expand-file-name name))
              ;; Windows UNC default dirs do not make sense for ftp.
-              (setq name (if (string-match "\\`//" default-directory)
+              (setq name (if (and default-directory
+				  (string-match "\\`//" default-directory))
                             (ange-ftp-real-expand-file-name name "c:/")
                           (ange-ftp-real-expand-file-name name)))
              ;; Strip off possible drive specifier.