Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-207
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-208
   Sync from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-209
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-210
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-211
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-212
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-213
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-214
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-215
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-81
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-82
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-83
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-549

1 files changed, 20 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d5e4d20111e..936b14089b4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2006-04-11  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * lisp.h (wrong_type_argument): Mark as NO_RETURN.
+
+        * data.c (wrong_type_argument): Try to avoid compiler warnings due
+        to the fact the function is now marked as NO_RETURN.
+
+2006-04-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * s/ms-w32.h (pid_t) [_MSC_VER]: New typedef.
+
+2006-04-10  Romain Francoise  <romain@orebokech.com>
+
+        * xrdb.c (gethomedir): Use xstrdup.
+
+2006-04-10  Andreas Schwab  <schwab@suse.de>
+
+        * xrdb.c (gethomedir): Make sure to always return a pointer that
+        can be passed to free.
+
 2006-04-09  Richard Stallman  <rms@gnu.org>
 
         * lisp.h (Fkill_emacs): Undo previous change.