(x-handle-args): Stop arg processing

if we encounter "--", and preserve all remaining args.

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 1d927d71a18428a28a3602f25a3d13a70bfda103..12a1ec48163e9657ef49e95749afb22c3e4260a1 100644 (file)
--- 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))
 \f
 ;;
 ;; Standard X cursor shapes, courtesy of Mr. Fox, who wanted ALL of them.