From ee291b4684fe84c1133d529816c8177a99bce9ba Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 9 Sep 2002 19:23:37 +0000 Subject: (make-backup-file-name-1): When make-directory fails, ignore backup-directory-alist. (make-directory): Expand DIR before looking for handler. --- lisp/files.el | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lisp/files.el') diff --git a/lisp/files.el b/lisp/files.el index ac61bbbd01..d720c858c0 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2574,18 +2574,18 @@ doesn't exist, it is created." (defun make-backup-file-name-1 (file) "Subroutine of `make-backup-file-name' and `find-backup-file-name'." (let ((alist backup-directory-alist) - elt backup-directory) + elt backup-directory failed) (while alist (setq elt (pop alist)) (if (string-match (car elt) file) (setq backup-directory (cdr elt) alist nil))) - (if (null backup-directory) - file - (unless (file-exists-p backup-directory) + (if (and backup-directory (not (file-exists-p backup-directory))) (condition-case nil (make-directory backup-directory 'parents) - (file-error file))) + (file-error (setq backup-directory nil)))) + (if (null backup-directory) + file (if (file-name-absolute-p backup-directory) (progn (when (memq system-type '(windows-nt ms-dos)) @@ -3199,6 +3199,9 @@ to create parent directories if they don't exist." (list (read-file-name "Make directory: " default-directory default-directory nil nil) t)) + ;; If default-directory is a remote directory, + ;; make sure we find its make-directory handler. + (setq dir (expand-file-name dir)) (let ((handler (find-file-name-handler dir 'make-directory))) (if handler (funcall handler 'make-directory dir parents) -- cgit v1.2.3