* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
;;; common-win.el --- common part of handling window systems
|
|
|
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
|
;; Copyright (C) 1993-1994, 2001-2019 Free Software Foundation, Inc.
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
|
|
|
|
|
|
;; Keywords: terminals
|
|
|
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
2010-10-24 22:04:45 +00:00
|
|
|
|
;;;; Function keys
|
|
|
|
|
|
|
|
|
|
|
|
(defvar x-alternatives-map
|
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
|
;; Map certain keypad keys into ASCII characters that people usually expect.
|
|
|
|
|
|
(define-key map [M-backspace] [?\M-\d])
|
|
|
|
|
|
(define-key map [M-delete] [?\M-\d])
|
|
|
|
|
|
(define-key map [M-tab] [?\M-\t])
|
|
|
|
|
|
(define-key map [M-linefeed] [?\M-\n])
|
|
|
|
|
|
(define-key map [M-clear] [?\M-\C-l])
|
|
|
|
|
|
(define-key map [M-return] [?\M-\C-m])
|
|
|
|
|
|
(define-key map [M-escape] [?\M-\e])
|
2010-10-26 02:59:05 +00:00
|
|
|
|
(unless (featurep 'ns)
|
|
|
|
|
|
(define-key map [iso-lefttab] [backtab])
|
|
|
|
|
|
(define-key map [S-iso-lefttab] [backtab]))
|
|
|
|
|
|
(and (or (eq system-type 'windows-nt)
|
|
|
|
|
|
(featurep 'ns))
|
2010-10-24 22:04:45 +00:00
|
|
|
|
(define-key map [S-tab] [backtab]))
|
|
|
|
|
|
map)
|
|
|
|
|
|
"Keymap of possible alternative meanings for some keys.")
|
|
|
|
|
|
|
|
|
|
|
|
(defun x-setup-function-keys (frame)
|
|
|
|
|
|
"Set up `function-key-map' on the graphical frame FRAME."
|
|
|
|
|
|
;; Don't do this twice on the same display, or it would break
|
|
|
|
|
|
;; normal-erase-is-backspace-mode.
|
|
|
|
|
|
(unless (terminal-parameter frame 'x-setup-function-keys)
|
|
|
|
|
|
;; Map certain keypad keys into ASCII characters that people usually expect.
|
|
|
|
|
|
(with-selected-frame frame
|
|
|
|
|
|
(let ((map (copy-keymap x-alternatives-map)))
|
|
|
|
|
|
(set-keymap-parent map (keymap-parent local-function-key-map))
|
2010-10-26 02:59:05 +00:00
|
|
|
|
(set-keymap-parent local-function-key-map map))
|
|
|
|
|
|
(when (featurep 'ns)
|
2014-10-03 01:39:49 +00:00
|
|
|
|
(setq system-key-alist
|
2010-10-26 02:59:05 +00:00
|
|
|
|
(list
|
2010-10-26 13:20:00 +00:00
|
|
|
|
;; These are special "keys" used to pass events from C to lisp.
|
Audit use of lsh and fix glitches
I audited use of lsh in the Lisp source code, and fixed the
glitches that I found. While I was at it, I replaced uses of lsh
with ash when either will do. Replacement is OK when either
argument is known to be nonnegative, or when only the low-order
bits of the result matter, and is a (minor) win since ash is a bit
more solid than lsh nowadays, and is a bit faster.
* lisp/calc/calc-ext.el (math-check-fixnum):
Prefer most-positive-fixnum to (lsh -1 -1).
* lisp/vc/vc-hg.el (vc-hg-state-fast): When testing fixnum width,
prefer (zerop (ash most-positive-fixnum -32)) to (zerop (lsh -1
32)) (Bug#32485#11).
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode):
Tighten sanity-check for bytecode overflow, by checking that the
result of (ash pc -8) is nonnegative. Formerly this check was not
needed since lsh was used and the number overflowed differently.
* lisp/net/dns.el (dns-write): Fix some obvious sign typos in
shift counts. Evidently this part of the code has never been
exercised.
* lisp/progmodes/hideif.el (hif-shiftleft, hif-shiftright):
* lisp/term/common-win.el (x-setup-function-keys):
Simplify.
* admin/unidata/unidata-gen.el, admin/unidata/uvs.el:
* doc/lispref/keymaps.texi, doc/lispref/syntax.texi:
* doc/misc/calc.texi, doc/misc/cl.texi, etc/NEWS.19:
* lisp/arc-mode.el, lisp/calc/calc-bin.el, lisp/calc/calc-comb.el:
* lisp/calc/calc-ext.el, lisp/calc/calc-math.el:
* lisp/cedet/semantic/wisent/comp.el, lisp/composite.el:
* lisp/disp-table.el, lisp/dos-fns.el, lisp/edmacro.el:
* lisp/emacs-lisp/bindat.el, lisp/emacs-lisp/byte-opt.el:
* lisp/emacs-lisp/bytecomp.el, lisp/emacs-lisp/cl-extra.el:
* lisp/erc/erc-dcc.el, lisp/facemenu.el, lisp/gnus/message.el:
* lisp/gnus/nndoc.el, lisp/gnus/nnmaildir.el, lisp/image.el:
* lisp/international/ccl.el, lisp/international/fontset.el:
* lisp/international/mule-cmds.el, lisp/international/mule.el:
* lisp/json.el, lisp/mail/binhex.el, lisp/mail/rmail.el:
* lisp/mail/uudecode.el, lisp/md4.el, lisp/net/dns.el:
* lisp/net/ntlm.el, lisp/net/sasl.el, lisp/net/socks.el:
* lisp/net/tramp.el, lisp/obsolete/levents.el:
* lisp/obsolete/pgg-parse.el, lisp/org/org.el:
* lisp/org/ox-publish.el, lisp/progmodes/cc-defs.el:
* lisp/progmodes/ebnf2ps.el, lisp/progmodes/hideif.el:
* lisp/ps-bdf.el, lisp/ps-print.el, lisp/simple.el:
* lisp/tar-mode.el, lisp/term/common-win.el:
* lisp/term/tty-colors.el, lisp/term/xterm.el, lisp/vc/vc-git.el:
* lisp/vc/vc-hg.el, lisp/x-dnd.el, test/src/data-tests.el:
Prefer ash to lsh when either will do.
2018-08-21 20:44:03 +00:00
|
|
|
|
(cons 1 'ns-power-off)
|
|
|
|
|
|
(cons 2 'ns-open-file)
|
|
|
|
|
|
(cons 3 'ns-open-temp-file)
|
|
|
|
|
|
(cons 4 'ns-drag-file)
|
|
|
|
|
|
(cons 5 'ns-drag-color)
|
|
|
|
|
|
(cons 6 'ns-drag-text)
|
|
|
|
|
|
(cons 7 'ns-change-font)
|
|
|
|
|
|
(cons 8 'ns-open-file-line)
|
|
|
|
|
|
;;; (cons 9 'ns-insert-working-text)
|
|
|
|
|
|
;;; (cons 10 'ns-delete-working-text)
|
|
|
|
|
|
(cons 11 'ns-spi-service-call)
|
|
|
|
|
|
(cons 12 'ns-new-frame)
|
|
|
|
|
|
(cons 13 'ns-toggle-toolbar)
|
|
|
|
|
|
(cons 14 'ns-show-prefs)
|
2010-10-26 13:20:00 +00:00
|
|
|
|
))))
|
2010-10-24 22:04:45 +00:00
|
|
|
|
(set-terminal-parameter frame 'x-setup-function-keys t)))
|
|
|
|
|
|
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
(defvar x-invocation-args)
|
|
|
|
|
|
|
|
|
|
|
|
(defvar x-command-line-resources nil)
|
|
|
|
|
|
|
|
|
|
|
|
;; Handler for switches of the form "-switch value" or "-switch".
|
2010-10-25 05:39:21 +00:00
|
|
|
|
(defun x-handle-switch (switch &optional numeric)
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
(let ((aelt (assoc switch command-line-x-option-alist)))
|
|
|
|
|
|
(if aelt
|
2010-10-25 05:39:21 +00:00
|
|
|
|
(setq default-frame-alist
|
|
|
|
|
|
(cons (cons (nth 3 aelt)
|
|
|
|
|
|
(if numeric
|
|
|
|
|
|
(string-to-number (pop x-invocation-args))
|
|
|
|
|
|
(or (nth 4 aelt) (pop x-invocation-args))))
|
|
|
|
|
|
default-frame-alist)))))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
|
|
|
|
|
|
;; Handler for switches of the form "-switch n"
|
|
|
|
|
|
(defun x-handle-numeric-switch (switch)
|
2010-10-25 05:39:21 +00:00
|
|
|
|
(x-handle-switch switch t))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
|
|
|
|
|
|
;; Handle options that apply to initial frame only
|
|
|
|
|
|
(defun x-handle-initial-switch (switch)
|
|
|
|
|
|
(let ((aelt (assoc switch command-line-x-option-alist)))
|
|
|
|
|
|
(if aelt
|
2010-10-25 05:39:21 +00:00
|
|
|
|
(setq initial-frame-alist
|
|
|
|
|
|
(cons (cons (nth 3 aelt)
|
|
|
|
|
|
(or (nth 4 aelt) (pop x-invocation-args)))
|
|
|
|
|
|
initial-frame-alist)))))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
|
|
|
|
|
|
;; Make -iconic apply only to the initial frame!
|
2013-08-08 23:59:14 +00:00
|
|
|
|
(defun x-handle-iconic (_switch)
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
(setq initial-frame-alist
|
|
|
|
|
|
(cons '(visibility . icon) initial-frame-alist)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Handle the -xrm option.
|
|
|
|
|
|
(defun x-handle-xrm-switch (switch)
|
|
|
|
|
|
(unless (consp x-invocation-args)
|
2017-12-12 08:00:33 +00:00
|
|
|
|
(error "%s: missing argument to `%s' option" invocation-name switch))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
(setq x-command-line-resources
|
|
|
|
|
|
(if (null x-command-line-resources)
|
2010-10-25 05:39:21 +00:00
|
|
|
|
(pop x-invocation-args)
|
|
|
|
|
|
(concat x-command-line-resources "\n" (pop x-invocation-args)))))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
|
|
|
|
|
|
(declare-function x-parse-geometry "frame.c" (string))
|
|
|
|
|
|
|
|
|
|
|
|
;; Handle the geometry option
|
2013-08-08 23:59:14 +00:00
|
|
|
|
(defun x-handle-geometry (_switch)
|
2010-10-25 05:39:21 +00:00
|
|
|
|
(let* ((geo (x-parse-geometry (pop x-invocation-args)))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
(left (assq 'left geo))
|
|
|
|
|
|
(top (assq 'top geo))
|
|
|
|
|
|
(height (assq 'height geo))
|
|
|
|
|
|
(width (assq 'width geo)))
|
|
|
|
|
|
(if (or height width)
|
|
|
|
|
|
(setq default-frame-alist
|
|
|
|
|
|
(append default-frame-alist
|
|
|
|
|
|
'((user-size . t))
|
|
|
|
|
|
(if height (list height))
|
|
|
|
|
|
(if width (list width)))
|
|
|
|
|
|
initial-frame-alist
|
|
|
|
|
|
(append initial-frame-alist
|
|
|
|
|
|
'((user-size . t))
|
|
|
|
|
|
(if height (list height))
|
|
|
|
|
|
(if width (list width)))))
|
|
|
|
|
|
(if (or left top)
|
|
|
|
|
|
(setq initial-frame-alist
|
|
|
|
|
|
(append initial-frame-alist
|
|
|
|
|
|
'((user-position . t))
|
|
|
|
|
|
(if left (list left))
|
2010-10-25 05:39:21 +00:00
|
|
|
|
(if top (list top)))))))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
|
|
|
|
|
|
(defvar x-resource-name)
|
|
|
|
|
|
|
|
|
|
|
|
;; Handle the -name option. Set the variable x-resource-name
|
|
|
|
|
|
;; to the option's operand; set the name of
|
|
|
|
|
|
;; the initial frame, too.
|
|
|
|
|
|
(defun x-handle-name-switch (switch)
|
|
|
|
|
|
(or (consp x-invocation-args)
|
2017-12-12 08:00:33 +00:00
|
|
|
|
(error "%s: missing argument to `%s' option" invocation-name switch))
|
2010-10-25 05:39:21 +00:00
|
|
|
|
(setq x-resource-name (pop x-invocation-args)
|
|
|
|
|
|
initial-frame-alist (cons (cons 'name x-resource-name)
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
initial-frame-alist)))
|
|
|
|
|
|
|
|
|
|
|
|
(defvar x-display-name nil
|
2009-07-25 09:31:05 +00:00
|
|
|
|
"The name of the window display on which Emacs was started.
|
|
|
|
|
|
On X, the display name of individual X frames is recorded in the
|
|
|
|
|
|
`display' frame parameter.")
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
|
2013-08-08 23:59:14 +00:00
|
|
|
|
(defun x-handle-display (_switch)
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
"Handle -display DISPLAY option."
|
2010-10-25 05:39:21 +00:00
|
|
|
|
(setq x-display-name (pop x-invocation-args))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
;; Make subshell programs see the same DISPLAY value Emacs really uses.
|
|
|
|
|
|
;; Note that this isn't completely correct, since Emacs can use
|
|
|
|
|
|
;; multiple displays. However, there is no way to tell an already
|
|
|
|
|
|
;; running subshell which display the user is currently typing on.
|
|
|
|
|
|
(setenv "DISPLAY" x-display-name))
|
|
|
|
|
|
|
|
|
|
|
|
(defun x-handle-args (args)
|
2010-10-26 03:58:19 +00:00
|
|
|
|
"Process the X (or Nextstep) related command line options in ARGS.
|
|
|
|
|
|
This is done before the user's startup file is loaded.
|
|
|
|
|
|
Copies the options in ARGS to `x-invocation-args'. It then extracts
|
|
|
|
|
|
the X (or Nextstep) options according to the handlers defined in
|
|
|
|
|
|
`command-line-x-option-alist' (or `command-line-ns-option-alist').
|
|
|
|
|
|
For example, `x-handle-switch' handles a switch like \"-fg\" and its
|
|
|
|
|
|
value \"black\". This function returns ARGS minus the arguments that
|
|
|
|
|
|
have been processed."
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
;; We use ARGS to accumulate the args that we don't handle here, to return.
|
2010-10-26 02:59:05 +00:00
|
|
|
|
(setq x-invocation-args args ; FIXME let-bind?
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
args nil)
|
|
|
|
|
|
(while (and x-invocation-args
|
|
|
|
|
|
(not (equal (car x-invocation-args) "--")))
|
2010-10-25 05:39:21 +00:00
|
|
|
|
(let* ((this-switch (pop x-invocation-args))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
(orig-this-switch this-switch)
|
2010-10-26 03:58:19 +00:00
|
|
|
|
(option-alist (if (featurep 'ns)
|
|
|
|
|
|
command-line-ns-option-alist
|
|
|
|
|
|
command-line-x-option-alist))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
completion argval aelt handler)
|
|
|
|
|
|
;; Check for long options with attached arguments
|
|
|
|
|
|
;; and separate out the attached option argument into argval.
|
|
|
|
|
|
(if (string-match "^--[^=]*=" this-switch)
|
|
|
|
|
|
(setq argval (substring this-switch (match-end 0))
|
|
|
|
|
|
this-switch (substring this-switch 0 (1- (match-end 0)))))
|
|
|
|
|
|
;; Complete names of long options.
|
|
|
|
|
|
(if (string-match "^--" this-switch)
|
|
|
|
|
|
(progn
|
2010-10-26 03:58:19 +00:00
|
|
|
|
(setq completion (try-completion this-switch option-alist))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
(if (eq completion t)
|
|
|
|
|
|
;; Exact match for long option.
|
|
|
|
|
|
nil
|
|
|
|
|
|
(if (stringp completion)
|
2010-10-26 03:58:19 +00:00
|
|
|
|
(let ((elt (assoc completion option-alist)))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
;; Check for abbreviated long option.
|
|
|
|
|
|
(or elt
|
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file, basic-save-buffer)
(delete-directory, copy-directory, recover-session)
(recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(compose-mail, set-variable, choose-completion-string)
(define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, command-line)
(command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice, version-to-list):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
2015-09-07 15:41:44 +00:00
|
|
|
|
(error "Option `%s' is ambiguous" this-switch))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
(setq this-switch completion))))))
|
2010-10-26 03:58:19 +00:00
|
|
|
|
(setq aelt (assoc this-switch option-alist))
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
(if aelt (setq handler (nth 2 aelt)))
|
|
|
|
|
|
(if handler
|
|
|
|
|
|
(if argval
|
|
|
|
|
|
(let ((x-invocation-args
|
|
|
|
|
|
(cons argval x-invocation-args)))
|
|
|
|
|
|
(funcall handler this-switch))
|
|
|
|
|
|
(funcall handler this-switch))
|
|
|
|
|
|
(setq args (cons orig-this-switch args)))))
|
|
|
|
|
|
(nconc (nreverse args) x-invocation-args))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; Available colors
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; The ordering of the colors is chosen for the user's convenience in
|
|
|
|
|
|
;; `list-colors-display', which displays the reverse of this list.
|
|
|
|
|
|
;; Roughly speaking, `list-colors-display' orders by (i) named shades
|
2011-11-27 04:43:11 +00:00
|
|
|
|
;; of gray with hue 0.0, sorted by value (ii) named colors with
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
;; saturation 1.0, sorted by hue, (iii) named non-white colors with
|
|
|
|
|
|
;; saturation less than 1.0, sorted by hue, (iv) other named shades of
|
|
|
|
|
|
;; white, (v) numbered colors sorted by hue, and (vi) numbered shades
|
2011-11-27 04:43:11 +00:00
|
|
|
|
;; of gray.
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
|
2010-10-26 02:59:05 +00:00
|
|
|
|
(declare-function ns-list-colors "nsfns.m" (&optional frame))
|
|
|
|
|
|
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
(defvar x-colors
|
2010-10-26 02:59:05 +00:00
|
|
|
|
(if (featurep 'ns) (ns-list-colors)
|
|
|
|
|
|
(purecopy
|
|
|
|
|
|
'("gray100" "grey100" "gray99" "grey99" "gray98" "grey98" "gray97"
|
|
|
|
|
|
"grey97" "gray96" "grey96" "gray95" "grey95" "gray94" "grey94"
|
|
|
|
|
|
"gray93" "grey93" "gray92" "grey92" "gray91" "grey91" "gray90"
|
|
|
|
|
|
"grey90" "gray89" "grey89" "gray88" "grey88" "gray87" "grey87"
|
|
|
|
|
|
"gray86" "grey86" "gray85" "grey85" "gray84" "grey84" "gray83"
|
|
|
|
|
|
"grey83" "gray82" "grey82" "gray81" "grey81" "gray80" "grey80"
|
|
|
|
|
|
"gray79" "grey79" "gray78" "grey78" "gray77" "grey77" "gray76"
|
|
|
|
|
|
"grey76" "gray75" "grey75" "gray74" "grey74" "gray73" "grey73"
|
|
|
|
|
|
"gray72" "grey72" "gray71" "grey71" "gray70" "grey70" "gray69"
|
|
|
|
|
|
"grey69" "gray68" "grey68" "gray67" "grey67" "gray66" "grey66"
|
|
|
|
|
|
"gray65" "grey65" "gray64" "grey64" "gray63" "grey63" "gray62"
|
|
|
|
|
|
"grey62" "gray61" "grey61" "gray60" "grey60" "gray59" "grey59"
|
|
|
|
|
|
"gray58" "grey58" "gray57" "grey57" "gray56" "grey56" "gray55"
|
|
|
|
|
|
"grey55" "gray54" "grey54" "gray53" "grey53" "gray52" "grey52"
|
|
|
|
|
|
"gray51" "grey51" "gray50" "grey50" "gray49" "grey49" "gray48"
|
|
|
|
|
|
"grey48" "gray47" "grey47" "gray46" "grey46" "gray45" "grey45"
|
|
|
|
|
|
"gray44" "grey44" "gray43" "grey43" "gray42" "grey42" "gray41"
|
|
|
|
|
|
"grey41" "gray40" "grey40" "gray39" "grey39" "gray38" "grey38"
|
|
|
|
|
|
"gray37" "grey37" "gray36" "grey36" "gray35" "grey35" "gray34"
|
|
|
|
|
|
"grey34" "gray33" "grey33" "gray32" "grey32" "gray31" "grey31"
|
|
|
|
|
|
"gray30" "grey30" "gray29" "grey29" "gray28" "grey28" "gray27"
|
|
|
|
|
|
"grey27" "gray26" "grey26" "gray25" "grey25" "gray24" "grey24"
|
|
|
|
|
|
"gray23" "grey23" "gray22" "grey22" "gray21" "grey21" "gray20"
|
|
|
|
|
|
"grey20" "gray19" "grey19" "gray18" "grey18" "gray17" "grey17"
|
|
|
|
|
|
"gray16" "grey16" "gray15" "grey15" "gray14" "grey14" "gray13"
|
|
|
|
|
|
"grey13" "gray12" "grey12" "gray11" "grey11" "gray10" "grey10"
|
|
|
|
|
|
"gray9" "grey9" "gray8" "grey8" "gray7" "grey7" "gray6" "grey6"
|
|
|
|
|
|
"gray5" "grey5" "gray4" "grey4" "gray3" "grey3" "gray2" "grey2"
|
|
|
|
|
|
"gray1" "grey1" "gray0" "grey0"
|
|
|
|
|
|
"LightPink1" "LightPink2" "LightPink3" "LightPink4"
|
|
|
|
|
|
"pink1" "pink2" "pink3" "pink4"
|
|
|
|
|
|
"PaleVioletRed1" "PaleVioletRed2" "PaleVioletRed3" "PaleVioletRed4"
|
|
|
|
|
|
"LavenderBlush1" "LavenderBlush2" "LavenderBlush3" "LavenderBlush4"
|
|
|
|
|
|
"VioletRed1" "VioletRed2" "VioletRed3" "VioletRed4"
|
|
|
|
|
|
"HotPink1" "HotPink2" "HotPink3" "HotPink4"
|
|
|
|
|
|
"DeepPink1" "DeepPink2" "DeepPink3" "DeepPink4"
|
|
|
|
|
|
"maroon1" "maroon2" "maroon3" "maroon4"
|
|
|
|
|
|
"orchid1" "orchid2" "orchid3" "orchid4"
|
|
|
|
|
|
"plum1" "plum2" "plum3" "plum4"
|
|
|
|
|
|
"thistle1" "thistle2" "thistle3" "thistle4"
|
|
|
|
|
|
"MediumOrchid1" "MediumOrchid2" "MediumOrchid3" "MediumOrchid4"
|
|
|
|
|
|
"DarkOrchid1" "DarkOrchid2" "DarkOrchid3" "DarkOrchid4"
|
|
|
|
|
|
"purple1" "purple2" "purple3" "purple4"
|
|
|
|
|
|
"MediumPurple1" "MediumPurple2" "MediumPurple3" "MediumPurple4"
|
|
|
|
|
|
"SlateBlue1" "SlateBlue2" "SlateBlue3" "SlateBlue4"
|
|
|
|
|
|
"RoyalBlue1" "RoyalBlue2" "RoyalBlue3" "RoyalBlue4"
|
|
|
|
|
|
"LightSteelBlue1" "LightSteelBlue2" "LightSteelBlue3" "LightSteelBlue4"
|
|
|
|
|
|
"SlateGray1" "SlateGray2" "SlateGray3" "SlateGray4"
|
|
|
|
|
|
"DodgerBlue1" "DodgerBlue2" "DodgerBlue3" "DodgerBlue4"
|
|
|
|
|
|
"SteelBlue1" "SteelBlue2" "SteelBlue3" "SteelBlue4"
|
|
|
|
|
|
"SkyBlue1" "SkyBlue2" "SkyBlue3" "SkyBlue4"
|
|
|
|
|
|
"LightSkyBlue1" "LightSkyBlue2" "LightSkyBlue3" "LightSkyBlue4"
|
|
|
|
|
|
"LightBlue1" "LightBlue2" "LightBlue3" "LightBlue4"
|
|
|
|
|
|
"CadetBlue1" "CadetBlue2" "CadetBlue3" "CadetBlue4"
|
|
|
|
|
|
"azure1" "azure2" "azure3" "azure4"
|
|
|
|
|
|
"LightCyan1" "LightCyan2" "LightCyan3" "LightCyan4"
|
|
|
|
|
|
"PaleTurquoise1" "PaleTurquoise2" "PaleTurquoise3" "PaleTurquoise4"
|
|
|
|
|
|
"DarkSlateGray1" "DarkSlateGray2" "DarkSlateGray3" "DarkSlateGray4"
|
|
|
|
|
|
"aquamarine1" "aquamarine2" "aquamarine3" "aquamarine4"
|
|
|
|
|
|
"SeaGreen1" "SeaGreen2" "SeaGreen3" "SeaGreen4"
|
|
|
|
|
|
"honeydew1" "honeydew2" "honeydew3" "honeydew4"
|
|
|
|
|
|
"DarkSeaGreen1" "DarkSeaGreen2" "DarkSeaGreen3" "DarkSeaGreen4"
|
|
|
|
|
|
"PaleGreen1" "PaleGreen2" "PaleGreen3" "PaleGreen4"
|
|
|
|
|
|
"DarkOliveGreen1" "DarkOliveGreen2" "DarkOliveGreen3" "DarkOliveGreen4"
|
|
|
|
|
|
"OliveDrab1" "OliveDrab2" "OliveDrab3" "OliveDrab4"
|
|
|
|
|
|
"ivory1" "ivory2" "ivory3" "ivory4"
|
|
|
|
|
|
"LightYellow1" "LightYellow2" "LightYellow3" "LightYellow4"
|
|
|
|
|
|
"khaki1" "khaki2" "khaki3" "khaki4"
|
|
|
|
|
|
"LemonChiffon1" "LemonChiffon2" "LemonChiffon3" "LemonChiffon4"
|
|
|
|
|
|
"LightGoldenrod1" "LightGoldenrod2" "LightGoldenrod3" "LightGoldenrod4"
|
|
|
|
|
|
"cornsilk1" "cornsilk2" "cornsilk3" "cornsilk4"
|
|
|
|
|
|
"goldenrod1" "goldenrod2" "goldenrod3" "goldenrod4"
|
|
|
|
|
|
"DarkGoldenrod1" "DarkGoldenrod2" "DarkGoldenrod3" "DarkGoldenrod4"
|
|
|
|
|
|
"wheat1" "wheat2" "wheat3" "wheat4"
|
|
|
|
|
|
"NavajoWhite1" "NavajoWhite2" "NavajoWhite3" "NavajoWhite4"
|
|
|
|
|
|
"burlywood1" "burlywood2" "burlywood3" "burlywood4"
|
|
|
|
|
|
"AntiqueWhite1" "AntiqueWhite2" "AntiqueWhite3" "AntiqueWhite4"
|
|
|
|
|
|
"bisque1" "bisque2" "bisque3" "bisque4"
|
|
|
|
|
|
"tan1" "tan2" "tan3" "tan4"
|
|
|
|
|
|
"PeachPuff1" "PeachPuff2" "PeachPuff3" "PeachPuff4"
|
|
|
|
|
|
"seashell1" "seashell2" "seashell3" "seashell4"
|
|
|
|
|
|
"chocolate1" "chocolate2" "chocolate3" "chocolate4"
|
|
|
|
|
|
"sienna1" "sienna2" "sienna3" "sienna4"
|
|
|
|
|
|
"LightSalmon1" "LightSalmon2" "LightSalmon3" "LightSalmon4"
|
|
|
|
|
|
"salmon1" "salmon2" "salmon3" "salmon4"
|
|
|
|
|
|
"coral1" "coral2" "coral3" "coral4"
|
|
|
|
|
|
"tomato1" "tomato2" "tomato3" "tomato4"
|
|
|
|
|
|
"MistyRose1" "MistyRose2" "MistyRose3" "MistyRose4"
|
|
|
|
|
|
"snow1" "snow2" "snow3" "snow4"
|
|
|
|
|
|
"RosyBrown1" "RosyBrown2" "RosyBrown3" "RosyBrown4"
|
|
|
|
|
|
"IndianRed1" "IndianRed2" "IndianRed3" "IndianRed4"
|
|
|
|
|
|
"firebrick1" "firebrick2" "firebrick3" "firebrick4"
|
|
|
|
|
|
"brown1" "brown2" "brown3" "brown4"
|
|
|
|
|
|
"magenta1" "magenta2" "magenta3" "magenta4"
|
|
|
|
|
|
"blue1" "blue2" "blue3" "blue4"
|
|
|
|
|
|
"DeepSkyBlue1" "DeepSkyBlue2" "DeepSkyBlue3" "DeepSkyBlue4"
|
|
|
|
|
|
"turquoise1" "turquoise2" "turquoise3" "turquoise4"
|
|
|
|
|
|
"cyan1" "cyan2" "cyan3" "cyan4"
|
|
|
|
|
|
"SpringGreen1" "SpringGreen2" "SpringGreen3" "SpringGreen4"
|
|
|
|
|
|
"green1" "green2" "green3" "green4"
|
|
|
|
|
|
"chartreuse1" "chartreuse2" "chartreuse3" "chartreuse4"
|
|
|
|
|
|
"yellow1" "yellow2" "yellow3" "yellow4"
|
|
|
|
|
|
"gold1" "gold2" "gold3" "gold4"
|
|
|
|
|
|
"orange1" "orange2" "orange3" "orange4"
|
|
|
|
|
|
"DarkOrange1" "DarkOrange2" "DarkOrange3" "DarkOrange4"
|
|
|
|
|
|
"OrangeRed1" "OrangeRed2" "OrangeRed3" "OrangeRed4"
|
|
|
|
|
|
"red1" "red2" "red3" "red4"
|
|
|
|
|
|
"lavender blush" "LavenderBlush" "ghost white" "GhostWhite"
|
|
|
|
|
|
"lavender" "alice blue" "AliceBlue" "azure" "light cyan"
|
|
|
|
|
|
"LightCyan" "mint cream" "MintCream" "honeydew" "ivory"
|
|
|
|
|
|
"light goldenrod yellow" "LightGoldenrodYellow" "light yellow"
|
|
|
|
|
|
"LightYellow" "beige" "floral white" "FloralWhite" "old lace"
|
|
|
|
|
|
"OldLace" "blanched almond" "BlanchedAlmond" "moccasin"
|
|
|
|
|
|
"papaya whip" "PapayaWhip" "bisque" "antique white"
|
|
|
|
|
|
"AntiqueWhite" "linen" "peach puff" "PeachPuff" "seashell"
|
|
|
|
|
|
"misty rose" "MistyRose" "snow" "light pink" "LightPink" "pink"
|
|
|
|
|
|
"hot pink" "HotPink" "deep pink" "DeepPink" "maroon"
|
|
|
|
|
|
"pale violet red" "PaleVioletRed" "violet red" "VioletRed"
|
|
|
|
|
|
"medium violet red" "MediumVioletRed" "violet" "plum" "thistle"
|
|
|
|
|
|
"orchid" "medium orchid" "MediumOrchid" "dark orchid"
|
|
|
|
|
|
"DarkOrchid" "purple" "blue violet" "BlueViolet" "medium purple"
|
|
|
|
|
|
"MediumPurple" "light slate blue" "LightSlateBlue"
|
|
|
|
|
|
"medium slate blue" "MediumSlateBlue" "slate blue" "SlateBlue"
|
|
|
|
|
|
"dark slate blue" "DarkSlateBlue" "midnight blue" "MidnightBlue"
|
|
|
|
|
|
"navy" "navy blue" "NavyBlue" "dark blue" "DarkBlue"
|
|
|
|
|
|
"light steel blue" "LightSteelBlue" "cornflower blue"
|
|
|
|
|
|
"CornflowerBlue" "dodger blue" "DodgerBlue" "royal blue"
|
|
|
|
|
|
"RoyalBlue" "light slate gray" "light slate grey"
|
|
|
|
|
|
"LightSlateGray" "LightSlateGrey" "slate gray" "slate grey"
|
|
|
|
|
|
"SlateGray" "SlateGrey" "dark slate gray" "dark slate grey"
|
|
|
|
|
|
"DarkSlateGray" "DarkSlateGrey" "steel blue" "SteelBlue"
|
|
|
|
|
|
"cadet blue" "CadetBlue" "light sky blue" "LightSkyBlue"
|
|
|
|
|
|
"sky blue" "SkyBlue" "light blue" "LightBlue" "powder blue"
|
|
|
|
|
|
"PowderBlue" "pale turquoise" "PaleTurquoise" "turquoise"
|
|
|
|
|
|
"medium turquoise" "MediumTurquoise" "dark turquoise"
|
|
|
|
|
|
"DarkTurquoise" "dark cyan" "DarkCyan" "aquamarine"
|
|
|
|
|
|
"medium aquamarine" "MediumAquamarine" "light sea green"
|
|
|
|
|
|
"LightSeaGreen" "medium sea green" "MediumSeaGreen" "sea green"
|
|
|
|
|
|
"SeaGreen" "dark sea green" "DarkSeaGreen" "pale green"
|
|
|
|
|
|
"PaleGreen" "lime green" "LimeGreen" "dark green" "DarkGreen"
|
|
|
|
|
|
"forest green" "ForestGreen" "light green" "LightGreen"
|
|
|
|
|
|
"green yellow" "GreenYellow" "yellow green" "YellowGreen"
|
|
|
|
|
|
"olive drab" "OliveDrab" "dark olive green" "DarkOliveGreen"
|
|
|
|
|
|
"lemon chiffon" "LemonChiffon" "khaki" "dark khaki" "DarkKhaki"
|
|
|
|
|
|
"cornsilk" "pale goldenrod" "PaleGoldenrod" "light goldenrod"
|
|
|
|
|
|
"LightGoldenrod" "goldenrod" "dark goldenrod" "DarkGoldenrod"
|
|
|
|
|
|
"wheat" "navajo white" "NavajoWhite" "tan" "burlywood"
|
|
|
|
|
|
"sandy brown" "SandyBrown" "peru" "chocolate" "saddle brown"
|
|
|
|
|
|
"SaddleBrown" "sienna" "rosy brown" "RosyBrown" "dark salmon"
|
|
|
|
|
|
"DarkSalmon" "coral" "tomato" "light salmon" "LightSalmon"
|
|
|
|
|
|
"salmon" "light coral" "LightCoral" "indian red" "IndianRed"
|
|
|
|
|
|
"firebrick" "brown" "dark red" "DarkRed" "magenta"
|
|
|
|
|
|
"dark magenta" "DarkMagenta" "dark violet" "DarkViolet"
|
|
|
|
|
|
"medium blue" "MediumBlue" "blue" "deep sky blue" "DeepSkyBlue"
|
|
|
|
|
|
"cyan" "medium spring green" "MediumSpringGreen" "spring green"
|
|
|
|
|
|
"SpringGreen" "green" "lawn green" "LawnGreen" "chartreuse"
|
|
|
|
|
|
"yellow" "gold" "orange" "dark orange" "DarkOrange" "orange red"
|
|
|
|
|
|
"OrangeRed" "red" "white" "white smoke" "WhiteSmoke" "gainsboro"
|
|
|
|
|
|
"light gray" "light grey" "LightGray" "LightGrey" "gray" "grey"
|
|
|
|
|
|
"dark gray" "dark grey" "DarkGray" "DarkGrey" "dim gray"
|
|
|
|
|
|
"dim grey" "DimGray" "DimGrey" "black")))
|
2009-07-25 09:31:05 +00:00
|
|
|
|
"List of basic colors available on color displays.
|
|
|
|
|
|
For X, the list comes from the `rgb.txt' file,v 10.41 94/02/20.
|
|
|
|
|
|
For Nextstep, this is a list of non-PANTONE colors returned by
|
|
|
|
|
|
the operating system.")
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
|
2010-10-24 22:04:45 +00:00
|
|
|
|
(defvar w32-color-map)
|
|
|
|
|
|
|
|
|
|
|
|
(defun xw-defined-colors (&optional frame)
|
|
|
|
|
|
"Internal function called by `defined-colors', which see."
|
2010-10-26 16:56:11 +00:00
|
|
|
|
(if (featurep 'ns)
|
|
|
|
|
|
x-colors
|
|
|
|
|
|
(or frame (setq frame (selected-frame)))
|
|
|
|
|
|
(let (defined-colors)
|
|
|
|
|
|
(dolist (this-color (if (eq system-type 'windows-nt)
|
|
|
|
|
|
(or (mapcar 'car w32-color-map) x-colors)
|
|
|
|
|
|
x-colors))
|
|
|
|
|
|
(and (color-supported-p this-color frame t)
|
|
|
|
|
|
(setq defined-colors (cons this-color defined-colors))))
|
|
|
|
|
|
defined-colors)))
|
2010-10-24 22:04:45 +00:00
|
|
|
|
|
2015-05-09 00:24:37 +00:00
|
|
|
|
(provide 'term/common-win)
|
|
|
|
|
|
|
* term/x-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Move ...
* term/common-win.el: ... here. New file.
* term/w32-win.el (x-handle-switch, x-handle-numeric-switch)
(x-handle-initial-switch, x-handle-iconic, x-handle-xrm-switch)
(x-handle-geometry, x-handle-name-switch, x-display-name)
(x-handle-display, x-handle-args, x-colors): Remove.
* loadup.el: Load term/common-win before term/x-win and term/w32-win.
2008-07-20 00:37:45 +00:00
|
|
|
|
;;; common-win.el ends here
|