Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-747
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-748
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-749
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-750
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-751
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-752
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-78
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-79
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-80
   Update from CVS

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

4 files changed, 15 insertions, 2 deletions

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index eb2dd13432a..487c842f6f2 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,15 @@
+2004-12-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xlwmenu.c (xlwMenuActionsList): Install MenuGadgetEscape as an
+        action procedure for compatibility with Lesstif/Motif.
+
+        * Makefile.in (mostlyclean): Don't remove *~ on clean.
+
+2004-12-26  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * lwlib-Xaw.c: Put <KeyPress>Escape in dialogOverride so dialogs only
+        pops down on Escape, not any keypress.
+
 2004-11-01  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * xlwmenu.c (find_first_selectable, find_next_selectable)
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 11368819f4a..dd2bb6537e9 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -57,7 +57,7 @@ lwlib-Xm.o:    lwlib-Xm.c lwlib-Xm.h lwlib.h lwlib-int.h lwlib-utils.h
 xlwmenu.o: xlwmenu.c xlwmenu.h lwlib.h xlwmenuP.h
 
 mostlyclean:
-        $(RM) *.o core errs ,* *~ *.a .emacs_* make.log MakeOut \#*
+        $(RM) *.o core errs ,* *.a .emacs_* make.log MakeOut \#*
 
 clean: mostlyclean
 distclean: clean
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 867193c7cc8..b0f3f6abce8 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -279,7 +279,7 @@ static char overrideTrans[] =
         "<Message>WM_PROTOCOLS: lwlib_delete_dialog()";
 /* Dialogs pop down on any key press */
 static char dialogOverride[] =
-       "<KeyPress>:     lwlib_delete_dialog()";
+       "<KeyPress>Escape:       lwlib_delete_dialog()";
 static void wm_delete_window();
 static XtActionsRec xaw_actions [] = {
   {"lwlib_delete_dialog", wm_delete_window}
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index d4eeeaa3eb4..43ae8ee2ea0 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -211,6 +211,7 @@ xlwMenuActionsList [] =
   {"right",             Right},
   {"select",            Select},
   {"key",               Key},
+  {"MenuGadgetEscape",  Key},   /* Compatibility with Lesstif/Motif.  */
   {"nothing",           Nothing},
 };