# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1263040289 -3600
# Node ID 6aa2fde93c552383b8a374ec9c0b92b445d5822f
# Parent  1e39371cff260d465872012dcc903f73c3954637
(command-line-1): Use orig-argi to check for ignored X and NS options.

diff -r 1e39371cff26 -r 6aa2fde93c55 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 09 13:13:15 2010 +0100
+++ b/lisp/ChangeLog	Sat Jan 09 13:31:29 2010 +0100
@@ -1,3 +1,8 @@
+2010-01-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* startup.el (command-line-1): Use orig-argi to check for ignored X and
+	NS options.
+
 2010-01-08  Kenichi Handa  <handa@m17n.org>
 
 	* international/fontset.el (build-default-fontset-data): Exclude
diff -r 1e39371cff26 -r 6aa2fde93c55 lisp/startup.el
--- a/lisp/startup.el	Sat Jan 09 13:13:15 2010 +0100
+++ b/lisp/startup.el	Sat Jan 09 13:31:29 2010 +0100
@@ -2184,12 +2184,12 @@
 		   (setq cl1-line (string-to-number (match-string 1 argi))
 			 cl1-column (string-to-number (match-string 2 argi))))
 
-		  ((setq cl1-tem (assoc argi command-line-x-option-alist))
+		  ((setq cl1-tem (assoc orig-argi command-line-x-option-alist))
 		   ;; Ignore X-windows options and their args if not using X.
 		   (setq command-line-args-left
 			 (nthcdr (nth 1 cl1-tem) command-line-args-left)))
 
-		  ((setq cl1-tem (assoc argi command-line-ns-option-alist))
+		  ((setq cl1-tem (assoc orig-argi command-line-ns-option-alist))
 		   ;; Ignore NS-windows options and their args if not using NS.
 		   (setq command-line-args-left
 			 (nthcdr (nth 1 cl1-tem) command-line-args-left)))