From a5b5acaf92e77036e5b513501d774629d22398b3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 23 Aug 2008 16:59:19 +0000 Subject: [PATCH] (command-line): Don't call tty-register-default-colors if initial-window-system is `pc'. --- lisp/startup.el | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/lisp/startup.el b/lisp/startup.el index 2663b8dd83c..6c4f2091b1a 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -737,21 +737,25 @@ opening the first frame (e.g. open a connection to an X server).") (setq eol-mnemonic-dos "(DOS)" eol-mnemonic-mac "(Mac)"))) - ;; Make sure window system's init file was loaded in loadup.el if using a window system. + ;; Make sure window system's init file was loaded in loadup.el if + ;; using a window system. (condition-case error (unless noninteractive (if (and initial-window-system (not (featurep - (intern (concat (symbol-name initial-window-system) "-win"))))) + (intern + (concat (symbol-name initial-window-system) "-win"))))) (error "Unsupported window system `%s'" initial-window-system)) ;; Process window-system specific command line parameters. (setq command-line-args - (funcall (or (cdr (assq initial-window-system handle-args-function-alist)) - (error "Unsupported window system `%s'" initial-window-system)) - command-line-args)) + (funcall + (or (cdr (assq initial-window-system handle-args-function-alist)) + (error "Unsupported window system `%s'" initial-window-system)) + command-line-args)) ;; Initialize the window system. (Open connection, etc.) - (funcall (or (cdr (assq initial-window-system window-system-initialization-alist)) - (error "Unsupported window system `%s'" initial-window-system)))) + (funcall + (or (cdr (assq initial-window-system window-system-initialization-alist)) + (error "Unsupported window system `%s'" initial-window-system)))) ;; If there was an error, print the error message and exit. (error (princ @@ -926,7 +930,11 @@ opening the first frame (e.g. open a connection to an X server).") ;; since users can connect to color-capable terminals and also ;; switch color support on or off in mid-session by setting the ;; tty-color-mode frame parameter. - (tty-register-default-colors) + ;; Exception: the `pc' ``window system'' has only 16 fixed colors, + ;; and they are already set at this point by a suitable function in + ;; window-system-initialization-alist. + (or (eq initial-window-system 'pc) + (tty-register-default-colors)) ;; Record whether the tool-bar is present before the user and site ;; init files are processed. frame-notice-user-settings uses this -- 2.39.5