aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2000-10-19 08:37:11 +0000
committerMiles Bader2000-10-19 08:37:11 +0000
commitd8abcd91a3b2d7c86b4cc8e4da3372f3b89a8f24 (patch)
tree9e7872d5aa0e863f977835912d9b570c278291d9
parente8bce0a9b6c15f10743b003aa11c150f3d1429a8 (diff)
downloademacs-d8abcd91a3b2d7c86b4cc8e4da3372f3b89a8f24.tar.gz
emacs-d8abcd91a3b2d7c86b4cc8e4da3372f3b89a8f24.zip
(frame-set-background-mode): `unspecified' &c are symbols, not strings.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/faces.el8
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ece3de69aa..9e08f40ecc9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12000-10-19 Miles Bader <miles@lsi.nec.co.jp>
2
3 * faces.el (frame-set-background-mode): `unspecified' &c are
4 symbols, not strings.
5
12000-10-19 Eli Zaretskii <eliz@is.elta.co.il> 62000-10-19 Eli Zaretskii <eliz@is.elta.co.il>
2 7
3 * term/tty-colors.el (color-name-rgb-alist): Add a comment 8 * term/tty-colors.el (color-name-rgb-alist): Add a comment
diff --git a/lisp/faces.el b/lisp/faces.el
index f4bd0eee9ce..7a5881fb511 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1304,7 +1304,9 @@ this won't have the expected effect."
1304 1304
1305 1305
1306(defun frame-set-background-mode (frame) 1306(defun frame-set-background-mode (frame)
1307 "Set up the `background-mode' and `display-type' frame parameters for FRAME." 1307 "Set up display-dependent faces on FRAME.
1308Display-dependent faces are those which have different definitions
1309according to the `background-mode' and `display-type' frame parameters."
1308 (let* ((bg-resource 1310 (let* ((bg-resource
1309 (and window-system 1311 (and window-system
1310 (x-get-resource ".backgroundMode" "BackgroundMode"))) 1312 (x-get-resource ".backgroundMode" "BackgroundMode")))
@@ -1318,9 +1320,9 @@ this won't have the expected effect."
1318 'dark) 1320 'dark)
1319 ;; Unspecified frame background color can only happen 1321 ;; Unspecified frame background color can only happen
1320 ;; on tty's. 1322 ;; on tty's.
1321 ((memq bg-color '("unspecified" "unspecified-bg")) 1323 ((memq bg-color '(unspecified unspecified-bg))
1322 'dark) 1324 'dark)
1323 ((eq bg-color "unspecified-fg") ; inverted colors 1325 ((eq bg-color 'unspecified-fg) ; inverted colors
1324 'light) 1326 'light)
1325 ((>= (apply '+ (x-color-values bg-color frame)) 1327 ((>= (apply '+ (x-color-values bg-color frame))
1326 ;; Just looking at the screen, colors whose 1328 ;; Just looking at the screen, colors whose