[Emacs-diffs] /srv/bzr/emacs/trunk r99278: * startup.el (command-line-1): Use orig-argi to check for ignored X and NS options

[Jan D.]

------------------------------------------------------------
revno: 99278 [merge]
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2010-01-09 13:32:37 +0100
message:
  * startup.el (command-line-1): Use orig-argi to check for ignored X and NS 
options
modified:
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-08 01:53:29 +0000
+++ b/lisp/ChangeLog    2010-01-09 12:31:29 +0000
@@ -1,3 +1,8 @@
+2010-01-09  Jan Djärv  <address@hidden>
+
+       * startup.el (command-line-1): Use orig-argi to check for ignored X and
+       NS options.
+
 2010-01-08  Kenichi Handa  <address@hidden>
 
        * international/fontset.el (build-default-fontset-data): Exclude

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2010-01-04 05:35:18 +0000
+++ b/lisp/startup.el   2010-01-09 12:31:29 +0000
@@ -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)))