(command-line-1): Use orig-argi to check for ignored X and NS options.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95410b9393ab8fdc00bbd7a2c30280092ca90efd..70874a9c2fbf7142deb27d14506d40541eef83d6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/startup.el b/lisp/startup.el
index da0264dba20537ceeccad9fd57e98678f343e38a..a8f2eae061353851e4877225a9a21dd545845d5c 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2184,12 +2184,12 @@ A fancy display is used on graphic displays, normal otherwise."
                   (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)))