summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2010-01-09 13:31:29 +0100
committerJan Djärv <jan.h.d@swipnet.se>2010-01-09 13:31:29 +0100
commitde62c4d98f81fa1f960aa00765263accdb86a0ff (patch)
treee95794db32cd72058f2582901d38f508fae224f6 /lisp/startup.el
parent4b00d3b1594378e77b3b485d1ed272be5bdab644 (diff)
downloademacs-de62c4d98f81fa1f960aa00765263accdb86a0ff.tar.gz
(command-line-1): Use orig-argi to check for ignored X and NS options.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index da0264dba20..a8f2eae0613 100644
--- 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)))