From: Karl Heuer <kwzh@gnu.org>
Date: Sun, 19 Oct 1997 21:02:27 +0000 (+0000)
Subject: (file-name-non-special): For insert-directory operation,
X-Git-Tag: emacs-20.3~2978
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5cb1f7280ab1b00f7c910af940834ac371bbcba2;p=emacs.git

(file-name-non-special): For insert-directory operation,
ensure that default-directory is an ordinary file name
before turning off file-name-handler-alist.
---

diff --git a/lisp/files.el b/lisp/files.el
index 01712f58e7b..6054af1b4e8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3076,6 +3076,12 @@ With prefix arg, silently save all file-visiting buffers, then kill."
 
 (defun file-name-non-special (operation &rest arguments)
   (let ((file-name-handler-alist nil)
+	(default-directory
+	  (if (eq operation 'insert-directory)
+	      (directory-file-name
+	       (expand-file-name 
+		(unhandled-file-name-directory default-directory)))
+	    default-directory))
 	;; Get a list of the indices of the args which are file names.
 	(file-arg-indices
 	 (cdr (or (assq operation