Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 781-792)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 33-41)
 * gnus--rel--5.10  (patch 226-228)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21

3 files changed, 11 insertions, 0 deletions

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 9a7f01ed901..95fe90f5e64 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-04  Ulrich Mueller  <ulm@gentoo.org>  (tiny change)
+
+        * ChgPane.c, ChgSel.c: Quiet --with-x-toolkit=no
+        compilation warnings: #include <config.h>.
+
+2007-06-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Version 22.1 released.
+
 2007-05-30  Ulrich Mueller  <ulm@gentoo.org>  (tiny change)
 
         * XMakeAssoc.c (XMakeAssoc): Use malloc rather than xmalloc.
diff --git a/oldXMenu/ChgPane.c b/oldXMenu/ChgPane.c
index 35caf0917c9..06b2faa4451 100644
--- a/oldXMenu/ChgPane.c
+++ b/oldXMenu/ChgPane.c
@@ -13,6 +13,7 @@
  *
  */
 
+#include <config.h>
 #include "XMenuInt.h"
 
 int
diff --git a/oldXMenu/ChgSel.c b/oldXMenu/ChgSel.c
index 4d246f7bdbc..9a1230bd39b 100644
--- a/oldXMenu/ChgSel.c
+++ b/oldXMenu/ChgSel.c
@@ -13,6 +13,7 @@
  *
  */
 
+#include <config.h>
 #include "XMenuInt.h"
 
 int