Resolved ChangeLog merge.

[gnus] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1c5fb2..851c1c5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,18 @@
        prompts for user, host, port, and password (the default generic prompt
        remains ugly).
 
+2011-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * auth-source.el (auth-source-netrc-create): Use `read-char' with no
+       argument that XEmacs doesn't support.
+
+       * dgnushack.el (dgnushack-compile): Exclude color.el from being
+       compiled for Emacsen having no `libxml-parse-html-region' support.
+
+       * gnus-xmas.el (gnus-xmas-define): Remove gnus-x-color-values.
+
+       * lpath.el: Bind buffer-save-without-query for XEmacs.
+
 2011-02-23  Julien Danjou  <julien@danjou.info>
 
        * gnus-art.el (article-make-date-line): Ignore errors if time is