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

[Chong Yidong]

Index: emacs/src/ChangeLog
diff -u emacs/src/ChangeLog:1.5121 emacs/src/ChangeLog:1.5122
--- emacs/src/ChangeLog:1.5121  Fri Jun  2 09:39:54 2006
+++ emacs/src/ChangeLog Fri Jun  2 16:35:59 2006
@@ -1,3 +1,8 @@
+2006-06-02  Chong Yidong  <address@hidden>
+
+       * xfns.c (x_set_icon_name): No-op if arg is non-nil and not a
+       string.
+
 2006-06-02  YAMAMOTO Mitsuharu  <address@hidden>
 
        * xdisp.c (next_element_from_composition): Set it->object to