[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el |
Date: |
Wed, 29 Jun 2005 16:55:30 -0400 |
Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.359 emacs/lisp/startup.el:1.360
*** emacs/lisp/startup.el:1.359 Fri Jun 17 15:34:39 2005
--- emacs/lisp/startup.el Wed Jun 29 20:55:30 2005
***************
*** 444,467 ****
;; frame-notice-user-settings didn't (such as on a tty).
;; frame-set-background-mode is idempotent, so it won't
;; cause any harm if it's already been done.
! (let ((frame-background-mode frame-background-mode)
! (frame (selected-frame))
term)
(when (and (null window-system)
! ;; Don't override a possibly customized value.
! (null frame-background-mode)
! ;; Don't override user specifications.
! (null (frame-parameter frame 'reverse))
(let ((bg (frame-parameter frame 'background-color)))
(or (null bg)
! (member bg '(unspecified "unspecified-bg")))))
(setq term (getenv "TERM"))
;; Some files in lisp/term do a better job with the
;; background mode, but we leave this here anyway, in
;; case they remove those files.
(if (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)"
term)
! (setq frame-background-mode 'light)))
(frame-set-background-mode (selected-frame)))))
;; Now we know the user's default font, so add it to the menu.
--- 444,466 ----
;; frame-notice-user-settings didn't (such as on a tty).
;; frame-set-background-mode is idempotent, so it won't
;; cause any harm if it's already been done.
! (let ((frame (selected-frame))
term)
(when (and (null window-system)
! ;; Don't override default set by files in lisp/term.
! (null default-frame-background-mode)
(let ((bg (frame-parameter frame 'background-color)))
(or (null bg)
! (member bg '(unspecified "unspecified-bg"
! "unspecified-fg")))))
!
(setq term (getenv "TERM"))
;; Some files in lisp/term do a better job with the
;; background mode, but we leave this here anyway, in
;; case they remove those files.
(if (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)"
term)
! (setq default-frame-background-mode 'light)))
(frame-set-background-mode (selected-frame)))))
;; Now we know the user's default font, so add it to the menu.