[Emacs-diffs] trunk r116769: lisp/term/ns-win.el (x-command-line-resources): Rename from ns-... version.

[Juanma Barranquero]

------------------------------------------------------------
revno: 116769
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2014-03-15 19:12:54 +0100
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/term/ns-win.el            nswin.el-20091113204419-o5vbwnq5f7feedwu-8708

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-15 17:37:58 +0000
+++ b/lisp/ChangeLog    2014-03-15 18:12:54 +0000
@@ -1,5 +1,11 @@
 2014-03-15  Juanma Barranquero  <address@hidden>
 
+       * 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)

=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el       2014-02-02 14:10:50 +0000
+++ b/lisp/term/ns-win.el       2014-03-15 18:12:54 +0000
@@ -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 @@
             (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.