diff options
| author | Andreas Schwab | 2012-07-25 12:46:59 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2012-07-25 12:46:59 +0200 |
| commit | 67ada220af08d704fa30196ea5b8660dc088b832 (patch) | |
| tree | 429872a4038e2e92763e1b016ba859b5d19e0623 | |
| parent | f08088e354f5933e0df618c80ccbf2635bb45bef (diff) | |
| download | emacs-67ada220af08d704fa30196ea5b8660dc088b832.tar.gz emacs-67ada220af08d704fa30196ea5b8660dc088b832.zip | |
Fixes: debbugs:12042
* faces.el (face-spec-reset-face): Fix last change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/faces.el | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 95f59c65fc7..a773e158e3c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-07-25 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * faces.el (face-spec-reset-face): Fix last change. (Bug#12042) | ||
| 4 | |||
| 1 | 2012-07-25 Christopher Schmidt <christopher@ch.ristopher.com> | 5 | 2012-07-25 Christopher Schmidt <christopher@ch.ristopher.com> |
| 2 | 6 | ||
| 3 | * emacs-lisp/pp.el (pp-display-expression): Select old selected | 7 | * emacs-lisp/pp.el (pp-display-expression): Select old selected |
diff --git a/lisp/faces.el b/lisp/faces.el index a5b29823b62..2e1ba7798e9 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -1547,14 +1547,14 @@ If SPEC is nil, return nil." | |||
| 1547 | ;; temacs, prior to loading frame.el. | 1547 | ;; temacs, prior to loading frame.el. |
| 1548 | (unless (and (fboundp 'display-graphic-p) | 1548 | (unless (and (fboundp 'display-graphic-p) |
| 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 (if (frame-parameter nil 'reverse) | 1552 | :foreground ,(if (frame-parameter nil 'reverse) |
| 1553 | "unspecified-bg" | 1553 | "unspecified-bg" |
| 1554 | "unspecified-fg") | 1554 | "unspecified-fg") |
| 1555 | :background (if (frame-parameter nil 'reverse) | 1555 | :background ,(if (frame-parameter nil 'reverse) |
| 1556 | "unspecified-fg" | 1556 | "unspecified-fg" |
| 1557 | "unspecified-bg")))) | 1557 | "unspecified-bg")))) |
| 1558 | ;; For all other faces, unspecify all attributes. | 1558 | ;; For all other faces, unspecify all attributes. |
| 1559 | (apply 'append | 1559 | (apply 'append |
| 1560 | (mapcar (lambda (x) (list (car x) 'unspecified)) | 1560 | (mapcar (lambda (x) (list (car x) 'unspecified)) |