[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111243: * net/ange-ftp.el (ange-ftp-make-directory): Don't raise an error,

[Michael Albinus]

------------------------------------------------------------
revno: 111243
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Sun 2013-02-10 11:07:09 +0100
message:
  * net/ange-ftp.el (ange-ftp-make-directory): Don't raise an error,
  if DIR exists and PARENTS is non-nil.
modified:
  lisp/ChangeLog
  lisp/net/ange-ftp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-09 04:43:42 +0000
+++ b/lisp/ChangeLog    2013-02-10 10:07:09 +0000
@@ -1,3 +1,8 @@
+2013-02-10  Michael Albinus  <address@hidden>
+
+       * net/ange-ftp.el (ange-ftp-make-directory): Don't raise an error,
+       if DIR exists and PARENTS is non-nil.
+
 2013-02-09  Chong Yidong  <address@hidden>
 
        * mail/emacsbug.el (report-emacs-bug): Change binding of

=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el      2013-01-01 09:11:05 +0000
+++ b/lisp/net/ange-ftp.el      2013-02-10 10:07:09 +0000
@@ -4087,7 +4087,8 @@
        (or (file-exists-p parent)
            (ange-ftp-make-directory parent parents))))
   (if (file-exists-p dir)
-      (error "Cannot make directory %s: file already exists" dir)
+      (unless parents
+       (error "Cannot make directory %s: file already exists" dir))
     (let ((parsed (ange-ftp-ftp-name dir)))
       (if parsed
          (let* ((host (nth 0 parsed))