[Emacs-diffs] /srv/bzr/emacs/trunk r106977: * net/ange-ftp.el (ange-ftp-canonize-filename): Check, that

[Michael Albinus]

------------------------------------------------------------
revno: 106977
author: Drew Adams  <address@hidden>
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sat 2012-01-28 12:26:29 +0100
message:
  * net/ange-ftp.el (ange-ftp-canonize-filename): Check, that
  `default-directory' is non-nil.
modified:
  lisp/ChangeLog
  lisp/net/ange-ftp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-28 10:49:17 +0000
+++ b/lisp/ChangeLog    2012-01-28 11:26:29 +0000
@@ -1,3 +1,8 @@
+2012-01-28  Drew Adams  <address@hidden>
+
+       * net/ange-ftp.el (ange-ftp-canonize-filename): Check, that
+       `default-directory' is non-nil.
+
 2012-01-28  Eli Zaretskii  <address@hidden>
 
        * mail/emacsbug.el (report-emacs-bug): Fill the potentially long

=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el      2012-01-19 07:21:25 +0000
+++ b/lisp/net/ange-ftp.el      2012-01-28 11:26:29 +0000
@@ -3098,7 +3098,8 @@
             (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.