From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 6 Jan 1997 06:51:12 +0000 (+0000)
Subject: (x-handle-args): Stop arg processing
X-Git-Tag: emacs-20.1~3109
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0dd96d4cbc6495d15002c073570fbc944962a7be;p=emacs.git

(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 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.