From: Juanma Barranquero <lekktu@gmail.com>
Date: Sat, 15 Mar 2014 18:12:54 +0000 (+0100)
Subject: lisp/term/ns-win.el (x-command-line-resources): Rename from ns-... version.
X-Git-Tag: emacs-24.3.90~181
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a2403e3d8edc2543a2dc8968682e50bd8e7f979a;p=emacs.git

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 33d203e121f..75cf239ef33 100644
--- 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 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.