[Emacs-diffs] Changes to emacs/lisp/startup.el

[Eli Zaretskii]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.284 emacs/lisp/startup.el:1.285
*** emacs/lisp/startup.el:1.284 Sun Jan 13 06:47:08 2002
--- emacs/lisp/startup.el       Mon Jan 14 08:49:32 2002
***************
*** 545,555 ****
  
  ;; Command-line options supported by tty's:
  (defconst tty-long-option-alist
!   '(("--name" .               "-name")
!     ("--title" .      "-T")
!     ("--reverse-video" . "-reverse")
      ("--foreground-color" . "-fg")
!     ("--background-color" . "-bg")))
  
  (defconst tool-bar-images-pixel-height 24
    "Height in pixels of images in the tool bar.")
--- 545,556 ----
  
  ;; Command-line options supported by tty's:
  (defconst tty-long-option-alist
!   '(("--name"           . "-name")
!     ("--title"                  . "-T")
!     ("--reverse-video"          . "-reverse")
      ("--foreground-color" . "-fg")
!     ("--background-color" . "-bg")
!     ("--color"                  . "-color")))
  
  (defconst tool-bar-images-pixel-height 24
    "Height in pixels of images in the tool bar.")
***************
*** 619,624 ****
--- 620,636 ----
               (setq default-frame-alist
                     (cons '(reverse . t)
                           default-frame-alist)))
+             ((string= this "-color")
+              (if (null argval)
+                  (setq argval 8))     ; default --color means 8 ANSI colors
+              (setq default-frame-alist
+                    (cons (cons 'tty-color-mode
+                                (cond
+                                 ((numberp argval) argval)
+                                 ((string-match "-?[0-9]+" argval)
+                                  (string-to-number argval))
+                                 (t (intern argval))))
+                          default-frame-alist)))
              (t (setq rest (cons this rest))))))
        (nreverse rest)))
  
***************
*** 818,824 ****
    ;; 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)
--- 830,838 ----
    ;; Register default TTY colors for the case the terminal hasn't a
    ;; terminal init file.
    (or (memq window-system '(x w32))
!       ;; We do this regardles of whether the terminal supports colors
!       ;; or not, since they can switch that support on or off in
!       ;; mid-session by setting the tty-color-mode frame parameter.
        (let* ((colors (cond ((eq window-system 'pc)
                              msdos-color-values)
                             ((eq system-type 'windows-nt)