mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-18 12:00:38 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Jan Djärv 2010-01-09 13:31:29 +01:00
parent 4b00d3b159
commit de62c4d98f
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

4
lisp/startup.el
View file

@ -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)))