mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-02 08:22:22 +00:00
Code Issues Releases Activity

lisp/term/ns-win.el (x-command-line-resources): Rename from ns-... version.

Browse Source 
(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.
This commit is contained in:
Juanma Barranquero 2014-03-15 19:12:54 +01:00
parent fd16b061a9
commit a2403e3d8e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -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)

5
lisp/term/ns-win.el
View File

@ -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.