mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-11 09:20:51 +00:00
Code Issues Releases Activity

(command-line): Move the code which registers the default colors to

Browse Source 
before before-init-hook.
This commit is contained in:
Eli Zaretskii 2000-10-17 12:59:41 +00:00
parent f86292a9e9
commit 1592c1efdf
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2000-10-17 Eli Zaretskii <eliz@is.elta.co.il>
* startup.el (command-line): Move the code which sets the default
TTY colors to before before-init-hook.
2000-10-17 Gerd Moellmann <gerd@gnu.org>
* jit-lock.el (jit-lock-stealth-time): Doc fix.

34
lisp/startup.el
View File

@ -665,6 +665,23 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(setq-default blink-cursor t)
(blink-cursor-mode 1))
;; Register default TTY colors for the case the terminal hasn't a
;; terminal init file.
(or (memq window-system '(x w32))
(not (tty-display-color-p))
(let* ((colors (cond ((eq window-system 'pc)
msdos-color-values)
((eq system-type 'windows-nt)
w32-tty-standard-colors)
(t tty-standard-colors)))
(color (car colors)))
(while colors
(tty-color-define (car color) (cadr color) (cddr color))
(setq colors (cdr colors) color (car colors)))
;; Modifying color mappings means realized faces don't
;; use the right colors, so clear them.
(clear-face-cache)))
(run-hooks 'before-init-hook)
;; Run the site-start library if it exists. The point of this file is
@ -796,23 +813,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(set-buffer "*scratch*")
(if (eq major-mode 'fundamental-mode)
(funcall initial-major-mode))))
;; Register default TTY colors for the case the terminal hasn't a
;; terminal init file.
(or (memq window-system '(x w32))
(not (tty-display-color-p))
(let* ((colors (cond ((eq window-system 'pc)
msdos-color-values)
((eq system-type 'windows-nt)
w32-tty-standard-colors)
(t tty-standard-colors)))
(color (car colors)))
(while colors
(tty-color-define (car color) (cadr color) (cddr color))
(setq colors (cdr colors) color (car colors)))
;; Modifying color mappings means realized faces don't
;; use the right colors, so clear them.
(clear-face-cache)))
;; Load library for our terminal type.
;; User init file can set term-file-prefix to nil to prevent this.