[Emacs-diffs] Changes to emacs/src/ChangeLog

[Eli Zaretskii]

Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.4734 emacs/src/ChangeLog:1.4735
*** emacs/src/ChangeLog:1.4734  Thu Nov 24 08:20:41 2005
--- emacs/src/ChangeLog Sat Nov 26 11:07:23 2005
***************
*** 1,3 ****
--- 1,8 ----
+ 2005-11-26  Henrik Enberg  <address@hidden>
+ 
+       * xfaces.c (Finternal_set_lisp_face_attribute_from_resource): 
+       Handle :inherit property as a lisp expression.
+ 
  2005-11-24  YAMAMOTO Mitsuharu  <address@hidden>
  
        * macterm.c (Qcontrol): Rename from Qctrl.  All uses changed.