From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 31 Dec 1996 04:50:27 +0000 (+0000)
Subject: (insert-directory): Use -- as arg
X-Git-Tag: emacs-20.1~3152
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8bf610ec0930235e2f98bba8bd70c233b1e9282;p=emacs.git

(insert-directory): Use -- as arg
so that a file name or pattern is never taken as an option.
---

diff --git a/lisp/files.el b/lisp/files.el
index 1341cd909b2..f62e7d9aa0c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2726,7 +2726,7 @@ If WILDCARD, it also runs the shell specified by `shell-file-name'."
 						(if (stringp switches)
 						    switches
 						  (mapconcat 'identity switches " "))
-						" "
+						" -- "
 						pattern)))
 		 ;; SunOS 4.1.3, SVr4 and others need the "." to list the
 		 ;; directory if FILE is a symbolic link.
@@ -2745,6 +2745,8 @@ If WILDCARD, it also runs the shell specified by `shell-file-name'."
 					  switches (substring switches (match-end 0))))
 				  (setq list (nreverse (cons switches list))))))
 			  (append list
+				  ;; Avoid lossage if FILE starts with `-'.
+				  '("--")
 				  (list
 				   (if full-directory-p
 				       (concat (file-name-as-directory file) ".")