diff options
| author | Matthias Dahl | 2014-04-05 10:44:56 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-04-05 10:44:56 +0300 |
| commit | f5e4494cd06f7624382f815585419f489bfe36c3 (patch) | |
| tree | b4891d0af45bc66e1dd58eba18f56568746142f3 /lisp/ChangeLog | |
| parent | fdafd487a90fbd4febe853971f238c5395c12542 (diff) | |
| download | emacs-f5e4494cd06f7624382f815585419f489bfe36c3.tar.gz emacs-f5e4494cd06f7624382f815585419f489bfe36c3.zip | |
Fix bug #16434 with handling the -rv command-line option.
lisp/faces.el (make-face-x-resource-internal): Do nothing when
inhibit-x-resources is non-nil. Don't touch the default face if
reversed video is given--as was done in previous versions of Emacs.
(face-set-after-frame-default): Don't call
make-face-x-resource-internal here.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bb283ab84df..71f3749a19c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -7,6 +7,12 @@ | |||
| 7 | value is returned if no matching attributes are found. | 7 | value is returned if no matching attributes are found. |
| 8 | (face-spec-recalc): Use the new optional argument when calling | 8 | (face-spec-recalc): Use the new optional argument when calling |
| 9 | face-spec-choose. (Bug#16378) | 9 | face-spec-choose. (Bug#16378) |
| 10 | (make-face-x-resource-internal): Do nothing when | ||
| 11 | inhibit-x-resources is non-nil. Don't touch the default face if | ||
| 12 | reversed video is given--as was done in previous versions of | ||
| 13 | Emacs. | ||
| 14 | (face-set-after-frame-default): Don't call | ||
| 15 | make-face-x-resource-internal here. (Bug#16434) | ||
| 10 | 16 | ||
| 11 | 2014-04-04 Tassilo Horn <tsdh@gnu.org> | 17 | 2014-04-04 Tassilo Horn <tsdh@gnu.org> |
| 12 | 18 | ||