summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-12-31 04:50:27 +0000
committerRichard M. Stallman <rms@gnu.org>1996-12-31 04:50:27 +0000
commit1ccc40079311a9165a60c3b82cc21b70d8c53794 (patch)
tree3667ce61131aa633797493112510161448602943
parenteed9d0b6ae79b82694c5198633507909d9bb874b (diff)
downloademacs-1ccc40079311a9165a60c3b82cc21b70d8c53794.tar.gz
(insert-directory): Use -- as arg
so that a file name or pattern is never taken as an option.
-rw-r--r--lisp/files.el4
1 files changed, 3 insertions, 1 deletions
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) ".")