aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-04-28 22:15:58 +0300
committerEli Zaretskii2014-04-28 22:15:58 +0300
commit2cfb51ef2a727a9479bb2af2f2d8773f86bae133 (patch)
tree7880748cd9320a7ade133187b3ba3a127ce8f6fc
parentbc6953b32f993be10ff3429af5bacb7e18b08ae7 (diff)
downloademacs-2cfb51ef2a727a9479bb2af2f2d8773f86bae133.tar.gz
emacs-2cfb51ef2a727a9479bb2af2f2d8773f86bae133.zip
Fix a typo in ChangeLog entry of last commit.
-rw-r--r--lisp/ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 26516fd2cd3..bb23d634ac1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
12014-04-27 Matthias Dahl <matthias.dahl@binary-island.eu> 12014-04-27 Matthias Dahl <matthias.dahl@binary-island.eu>
2 2
3 * faces.el (face-spec-recalc): Apply X resources only after the 3 * faces.el (face-spec-recalc): Apply X resources only after the
4 the defface spec has been applied. Thus, X resources are no longer 4 defface spec has been applied. Thus, X resources are no longer
5 overriden by the defface spec which also fixes issues on win32 where 5 overriden by the defface spec which also fixes issues on win32 where
6 the toolbar coloring was wrong because it is set through X resources 6 the toolbar coloring was wrong because it is set through X resources
7 and was (wrongfully) overriden. (Bug#16694) 7 and was (wrongfully) overriden. (Bug#16694)