Merged in changes from CVS HEAD

Patches applied:

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


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

1 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b6160fb5eb..9c21defd658 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (popup_get_selection): Check new parameter down_on_keypress
+        if a key press should pop down.  Only pop down if a key is pressed
+        outside the menu/dialog.
+        (create_and_show_popup_menu): Pass 0 for down_on_keypress to
+        popup_get_selection.
+        (create_and_show_dialog): Pass 1 for down_on_keypress to
+        popup_get_selection.
+
 2004-01-11  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * alloc.c (allocate_vectorlike): Surround calls to mallopt with