Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 320-342)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - lisp/play/cookie1.el (cookie): Work properly when there's only one entry
   - Add note about "link" button-class to etc/TODO

 * gnus--rel--5.10  (patch 108-112)

   - Merge from emacs--devo--0
   - Clean up merge mistakes
   - Update from CVS
   - Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86

1 files changed, 7 insertions, 3 deletions

diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 4ef3db9f2ea..817f1facdee 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -52,6 +52,9 @@ Boston, MA 02110-1301, USA.  */
 #if LINUX_VERSION_CODE >= 0x20000
 #define LINUX_MAP_SHARED_DOES_WORK
 #endif /* LINUX_VERSION_CODE >= 0x20000 */
+#if LINUX_VERSION_CODE >= 0x20400
+#define LINUX_SIGNALS_VIA_CHARACTERS_DOES_WORK
+#endif /* LINUX_VERSION_CODE >= 0x20400 */
 #endif /* HAVE_LINUX_VERSION_H */
 #endif /* emacs */
 #endif /* NOT_C_CODE */
@@ -247,9 +250,10 @@ Boston, MA 02110-1301, USA.  */
 #define C_DEBUG_SWITCH
 #endif
 
-/* Let's try this out, just in case.
-   Nah.  Rik Faith <faith@cs.unc.edu> says it doesn't work well.  */
-/* #define SIGNALS_VIA_CHARACTERS */
+/* 21 Jun 06: Eric Hanchrow <offby1@blarg.net> says this works.  */
+#ifdef LINUX_SIGNALS_VIA_CHARACTERS_DOES_WORK
+#define SIGNALS_VIA_CHARACTERS
+#endif
 
 /* Rob Malouf <malouf@csli.stanford.edu> says:
    SYSV IPC is standard a standard part of Linux since version 0.99pl10,