Mercurial > emacs
changeset 106771:5555a7ec947d
* startup.el (command-line-1): Use orig-argi to check for ignored X and NS options
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Sat, 09 Jan 2010 13:32:37 +0100 |
| parents | 21fd634f447a (current diff) 6aa2fde93c55 (diff) |
| children | d2c6973afc86 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jan 09 13:16:32 2010 +0900 +++ b/lisp/ChangeLog Sat Jan 09 13:32:37 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
--- a/lisp/startup.el Sat Jan 09 13:16:32 2010 +0900 +++ b/lisp/startup.el Sat Jan 09 13:32:37 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)))