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

5 files changed, 32 insertions, 2 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.
diff --git a/src/data.c b/src/data.c
index d2f6ce76905..fdad80b2727 100644
--- a/src/data.c
+++ b/src/data.c
@@ -126,7 +126,14 @@ wrong_type_argument (predicate, value)
       tem = call1 (predicate, value);
     }
   while (NILP (tem));
+  /* This function is marked as NO_RETURN, gcc would warn if it has a
+     return statement or if falls off the function.  Other compilers
+     warn if no return statement is present.  */
+#ifndef __GNUC__
   return value;
+#else
+  abort ();
+#endif
 }
 
 void
diff --git a/src/lisp.h b/src/lisp.h
index c28c981daf9..468b699fb06 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2246,7 +2246,7 @@ extern unsigned long cons_to_long P_ ((Lisp_Object));
 extern void args_out_of_range P_ ((Lisp_Object, Lisp_Object)) NO_RETURN;
 extern void args_out_of_range_3 P_ ((Lisp_Object, Lisp_Object,
                                      Lisp_Object)) NO_RETURN;
-extern Lisp_Object wrong_type_argument P_ ((Lisp_Object, Lisp_Object));
+extern Lisp_Object wrong_type_argument P_ ((Lisp_Object, Lisp_Object)) NO_RETURN;
 extern void store_symval_forwarding P_ ((Lisp_Object, Lisp_Object,
                                          Lisp_Object, struct buffer *));
 extern Lisp_Object do_symval_forwarding P_ ((Lisp_Object));
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 5c6d1d07c20..3e5d9c865bb 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -365,6 +365,9 @@ Boston, MA 02110-1301, USA.  */
 #define ftruncate _chsize
 #define getw      _getw
 #define getpid    _getpid
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
 #define isatty    _isatty
 #define logb      _logb
 #define _longjmp  longjmp
diff --git a/src/xrdb.c b/src/xrdb.c
index 2b7888ebe84..988db614c41 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -315,7 +315,7 @@ gethomedir ()
     }
 
   if (ptr == NULL)
-    return "/";
+    return xstrdup ("/");
 
   copy = (char *) malloc (strlen (ptr) + 2);
   strcpy (copy, ptr);