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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33d203e121f278e4499528328a80beca4d805d2e..75cf239ef33a49bde7b2672063221e07ec659c4f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2014-03-15  Juanma Barranquero  <lekktu@gmail.com>
 
+       * term/ns-win.el (x-command-line-resources): Rename from ns-... version,
+       for compatibility with other ports.
+       (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.
+
        * progmodes/python.el (defconst, python-syntax-count-quotes)
        (python-indent-region, python-indent-shift-right)
        (python-indent-dedent-line-backspace, python-nav-backward-sexp)

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index d91b594671fb2c0837982ada78724fc11be17157..47d953aebfba76c9a1bef21ee0d7b798925148dc 100644 (file)
--- 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.