Mercurial > emacs

changeset 32583:b41e3ebd087e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(command-line): Move the code which registers the default colors to before before-init-hook.
author Eli Zaretskii <eliz@gnu.org>
date Tue, 17 Oct 2000 12:57:50 +0000
parents 74a20f2a63f2
children 6c986070499e
files lisp/startup.el
diffstat 1 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/startup.el	Tue Oct 17 12:47:29 2000 +0000
+++ b/lisp/startup.el	Tue Oct 17 12:57:50 2000 +0000
@@ -665,6 +665,23 @@
     (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 @@
 	(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.