summaryrefslogtreecommitdiff
path: root/lisp/term
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-01-06 06:51:12 +0000
committerRichard M. Stallman <rms@gnu.org>1997-01-06 06:51:12 +0000
commite8a136f7a9d74b509cac012f1a8656126472be64 (patch)
tree345c90e311ec100a327bfc66ca871522acfea859 /lisp/term
parent105d3dbb656302ba8ae0e7cad7b9de8d030c9295 (diff)
downloademacs-e8a136f7a9d74b509cac012f1a8656126472be64.tar.gz
(x-handle-args): Stop arg processing
if we encounter "--", and preserve all remaining args.
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/x-win.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 1d927d71a18..12a1ec48163 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -165,7 +165,8 @@ This function returns ARGS minus the arguments that have been processed."
;; We use ARGS to accumulate the args that we don't handle here, to return.
(setq x-invocation-args args
args nil)
- (while x-invocation-args
+ (while (and x-invocation-args
+ (not (equal (car x-invocation-args) "--")))
(let* ((this-switch (car x-invocation-args))
(orig-this-switch this-switch)
completion argval aelt handler)
@@ -197,7 +198,7 @@ This function returns ARGS minus the arguments that have been processed."
(funcall handler this-switch))
(funcall handler this-switch))
(setq args (cons orig-this-switch args)))))
- (nreverse args))
+ (nconc (nreverse args) x-invocation-args))
;;
;; Standard X cursor shapes, courtesy of Mr. Fox, who wanted ALL of them.