diff options
| author | Stefan Monnier | 2014-07-09 14:46:33 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-07-09 14:46:33 -0400 |
| commit | f972be090b0ffdfe7f6fe8a9616fb5f9d410522d (patch) | |
| tree | 2547fb11022e1c447bf6cbe5393cb6ba5c6eb9b0 /lisp/ChangeLog | |
| parent | fded0b4a15d4ec7f92a64f03e9aa78f19a9b6031 (diff) | |
| download | emacs-f972be090b0ffdfe7f6fe8a9616fb5f9d410522d.tar.gz emacs-f972be090b0ffdfe7f6fe8a9616fb5f9d410522d.zip | |
* lisp/faces.el (face-name): Undo last change.
(x-resolve-font-name): Don't call face-name.
Fixes: debbugs:17956
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5bf133af77a..1ad086acf61 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-07-09 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * faces.el (face-name): Undo last change. | ||
| 4 | (x-resolve-font-name): Don't call face-name (bug#17956). | ||
| 5 | |||
| 1 | 2014-07-09 Fabián Ezequiel Gallina <fgallina@gnu.org> | 6 | 2014-07-09 Fabián Ezequiel Gallina <fgallina@gnu.org> |
| 2 | 7 | ||
| 3 | Fix dedenters and electric colon handling. (Bug#15163) | 8 | Fix dedenters and electric colon handling. (Bug#15163) |