mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org

Browse source
This commit is contained in:
Glenn Morris 2013-02-12 20:31:09 -08:00
commit 01fcc3a532
63 changed files with 242 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/net/ange-ftp.el
View file

@ -4084,7 +4084,8 @@ directory, so that Emacs will know its current contents."
(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))