diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2014-03-15 19:12:54 +0100 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2014-03-15 19:12:54 +0100 |
| commit | a2403e3d8edc2543a2dc8968682e50bd8e7f979a (patch) | |
| tree | 7396cd55f0b02900f9b954b59848fd56f0dfadf0 /lisp/term | |
| parent | fd16b061a9e6e89c905a7d7813867090622969e9 (diff) | |
| download | emacs-a2403e3d8edc2543a2dc8968682e50bd8e7f979a.tar.gz | |
lisp/term/ns-win.el (x-command-line-resources): Rename from ns-... version.
(ns-initialize-window-system): Use it. It is set in term/common-win.el
from the -xrm command line argument, but in the Nextstep port its value
is irrelevant because nsfns.m:Fx_open_connection ignores it for now.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/ns-win.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index d91b594671f..47d953aebfb 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -59,7 +59,8 @@ ;;;; Command line argument handling. (defvar x-invocation-args) -(defvar ns-command-line-resources nil) ; FIXME unused? +;; Set in term/common-win.el; currently unused by Nextstep's x-open-connection. +(defvar x-command-line-resources) ;; nsterm.m. (defvar ns-input-file) @@ -902,7 +903,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") (format "Creation of the standard fontset failed: %s" err) :error))) - (x-open-connection (system-name) nil t) + (x-open-connection (system-name) x-command-line-resources t) ;; Add GNUstep menu items Services, Hide and Quit. Rename Help to Info ;; and put it first (i.e. omit from menu-bar-final-items. |