summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/startup.el7
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e08f40ecc9..1539e0df30f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
2000-10-19 Miles Bader <miles@lsi.nec.co.jp>
+ * startup.el (normal-top-level): Call `frame-set-background-mode'
+ after `frame-notice-user-settings' because the latter doesn't call
+ the former on a tty.
+
* faces.el (frame-set-background-mode): `unspecified' &c are
symbols, not strings.
diff --git a/lisp/startup.el b/lisp/startup.el
index 432715182d2..2d3b8a70d4e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -473,6 +473,13 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
;; ...-frame-alist.
(if (fboundp 'frame-notice-user-settings)
(frame-notice-user-settings))
+ (if (fboundp 'frame-set-background-mode)
+ ;; Set the faces for the initial background mode even if
+ ;; 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.
+ (frame-set-background-mode (selected-frame)))
+
;; Now we know the user's default font, so add it to the menu.
(if (fboundp 'font-menu-add-default)
(font-menu-add-default))