aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/faces.el8
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 103f6dcfd5b..92148234226 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-07-18 Chong Yidong <cyd@gnu.org>
2
3 * faces.el (face-spec-reset-face): Handle reverse video (Bug#4238).
4
12012-07-18 Masatake YAMATO <yamato@redhat.com> 52012-07-18 Masatake YAMATO <yamato@redhat.com>
2 6
3 * progmodes/sh-script.el (sh-imenu-generic-expression): 7 * progmodes/sh-script.el (sh-imenu-generic-expression):
diff --git a/lisp/faces.el b/lisp/faces.el
index 68700c2455b..a5b29823b62 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1549,8 +1549,12 @@ If SPEC is nil, return nil."
1549 (display-graphic-p frame)) 1549 (display-graphic-p frame))
1550 '(:family "default" :foundry "default" :width normal 1550 '(:family "default" :foundry "default" :width normal
1551 :height 1 :weight normal :slant normal 1551 :height 1 :weight normal :slant normal
1552 :foreground "unspecified-fg" 1552 :foreground (if (frame-parameter nil 'reverse)
1553 :background "unspecified-bg"))) 1553 "unspecified-bg"
1554 "unspecified-fg")
1555 :background (if (frame-parameter nil 'reverse)
1556 "unspecified-fg"
1557 "unspecified-bg"))))
1554 ;; For all other faces, unspecify all attributes. 1558 ;; For all other faces, unspecify all attributes.
1555 (apply 'append 1559 (apply 'append
1556 (mapcar (lambda (x) (list (car x) 'unspecified)) 1560 (mapcar (lambda (x) (list (car x) 'unspecified))