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

[Juri Linkov]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.325 emacs/lisp/faces.el:1.326
*** emacs/lisp/faces.el:1.325   Sat Jun 25 23:48:27 2005
--- emacs/lisp/faces.el Wed Jun 29 20:55:15 2005
***************
*** 1575,1580 ****
--- 1575,1587 ----
                 (choice-item light)
                 (choice-item :tag "default" nil)))
  
+ (defvar default-frame-background-mode nil
+   "Internal variable for the default brightness of the background.
+ Emacs sets it automatically depending on the terminal type.
+ The value `nil' means `dark'.  If Emacs runs in non-windowed
+ mode from `xterm' or a similar terminal emulator, the value is
+ `light'.  On rxvt terminals, the value depends on the environment
+ variable COLORFGBG.")
  
  (defun frame-set-background-mode (frame)
    "Set up display-dependent faces on FRAME.
***************
*** 1590,1602 ****
                 (intern (downcase bg-resource)))
                ((and (null window-system) (null bg-color))
                 ;; No way to determine this automatically (?).
!                'dark)
                ;; Unspecified frame background color can only happen
                ;; on tty's.
                ((member bg-color '(unspecified "unspecified-bg"))
!                'dark)
                ((equal bg-color "unspecified-fg") ; inverted colors
!                'light)
                ((>= (apply '+ (x-color-values bg-color frame))
                    ;; Just looking at the screen, colors whose
                    ;; values add up to .6 of the white total
--- 1597,1609 ----
                 (intern (downcase bg-resource)))
                ((and (null window-system) (null bg-color))
                 ;; No way to determine this automatically (?).
!                (or default-frame-background-mode 'dark))
                ;; Unspecified frame background color can only happen
                ;; on tty's.
                ((member bg-color '(unspecified "unspecified-bg"))
!                (or default-frame-background-mode 'dark))
                ((equal bg-color "unspecified-fg") ; inverted colors
!                (if (eq default-frame-background-mode 'light) 'dark 'light))
                ((>= (apply '+ (x-color-values bg-color frame))
                    ;; Just looking at the screen, colors whose
                    ;; values add up to .6 of the white total