From a2403e3d8edc2543a2dc8968682e50bd8e7f979a Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 15 Mar 2014 19:12:54 +0100 Subject: [PATCH] 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. --- lisp/ChangeLog | 6 ++++++ lisp/term/ns-win.el | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 33d203e121..75cf239ef3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2014-03-15 Juanma Barranquero + * 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 d91b594671..47d953aebf 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. -- 2.20.1