1 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e452aa6686..c81dbf2889a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,20 @@
 2013-12-21  Chong Yidong  <cyd@gnu.org>
 
+        * custom.el (custom-theme-recalc-face): Do nothing if the face is
+        undefined.  Thus, theme settings for undefined faces do not take
+        effect until the faces are defined with defface, the same as with
+        theme variables.
+
+        * faces.el (face-spec-set): Use face-spec-recalc in all cases.
+        (face-spec-reset-face): Don't assign extra properties in temacs.
+        (face-spec-recalc): Apply X resources too.
+
+2013-12-21  Chong Yidong  <cyd@gnu.org>
+
         * faces.el (face-spec-set):
         * cus-face.el (custom-theme-set-faces, custom-set-faces):
         * custom.el (defface): Doc fixes (Bug#16203).
 
-2013-12-21  Chong Yidong  <cyd@gnu.org>
-
         * indent.el (indent-rigidly-map): Add docstring, and move commands
         into named functions.
         (indent-rigidly-left, indent-rigidly-right)