Added M-p and M-n key equivalents for up and down keys. Just for us Emacs

1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n
	key equivalents for up and down keys.  Just for us Emacs weenies :-)

diff --git a/ChangeLog b/ChangeLog
index 934f43e7357643b4467f4ab8f0a20bafce5b9821..801c010ee2e496f6ae2a2c955d6658735b8021d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n
+       key equivalents for up and down keys.  Just for us Emacs weenies :-)
+
 Thu Feb 19 12:18:24 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/testgtk.c : Use POINTER_MOTION_HINT when dragging

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 934f43e7357643b4467f4ab8f0a20bafce5b9821..801c010ee2e496f6ae2a2c955d6658735b8021d4 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n
+       key equivalents for up and down keys.  Just for us Emacs weenies :-)
+
 Thu Feb 19 12:18:24 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/testgtk.c : Use POINTER_MOTION_HINT when dragging

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 934f43e7357643b4467f4ab8f0a20bafce5b9821..801c010ee2e496f6ae2a2c955d6658735b8021d4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n
+       key equivalents for up and down keys.  Just for us Emacs weenies :-)
+
 Thu Feb 19 12:18:24 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/testgtk.c : Use POINTER_MOTION_HINT when dragging

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 934f43e7357643b4467f4ab8f0a20bafce5b9821..801c010ee2e496f6ae2a2c955d6658735b8021d4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n
+       key equivalents for up and down keys.  Just for us Emacs weenies :-)
+
 Thu Feb 19 12:18:24 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/testgtk.c : Use POINTER_MOTION_HINT when dragging

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 934f43e7357643b4467f4ab8f0a20bafce5b9821..801c010ee2e496f6ae2a2c955d6658735b8021d4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n
+       key equivalents for up and down keys.  Just for us Emacs weenies :-)
+
 Thu Feb 19 12:18:24 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/testgtk.c : Use POINTER_MOTION_HINT when dragging

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 934f43e7357643b4467f4ab8f0a20bafce5b9821..801c010ee2e496f6ae2a2c955d6658735b8021d4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n
+       key equivalents for up and down keys.  Just for us Emacs weenies :-)
+
 Thu Feb 19 12:18:24 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/testgtk.c : Use POINTER_MOTION_HINT when dragging

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 934f43e7357643b4467f4ab8f0a20bafce5b9821..801c010ee2e496f6ae2a2c955d6658735b8021d4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Added M-p and M-n
+       key equivalents for up and down keys.  Just for us Emacs weenies :-)
+
 Thu Feb 19 12:18:24 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/testgtk.c : Use POINTER_MOTION_HINT when dragging

diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index 6e87f2ba539bf7493f702a2058f4f64d2905a6d0..9bc3826046b8bfc2b6219a76e4f251aeccbfc35f 100644 (file)
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -104,7 +104,9 @@ gtk_combo_entry_key_press (GtkEntry * entry, GdkEventKey * event, GtkCombo * com
     return FALSE;
   li = g_list_find (GTK_LIST (combo->list)->children, gtk_combo_find (combo));
 
-  if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up)
+  if ((event->keyval == GDK_Up)
+      || (event->keyval == GDK_KP_Up)
+      || ((event->state & GDK_MOD1_MASK) && ((event->keyval == 'p') || (event->keyval == 'P'))))
     {
       if (li)
        li = li->prev;
@@ -119,7 +121,9 @@ gtk_combo_entry_key_press (GtkEntry * entry, GdkEventKey * event, GtkCombo * com
          return TRUE;
        }
     }
-  else if (event->keyval == GDK_Down || event->keyval == GDK_KP_Down)
+  else if ((event->keyval == GDK_Down)
+          || (event->keyval == GDK_KP_Down)
+          || ((event->state & GDK_MOD1_MASK) && ((event->keyval == 'n') || (event->keyval == 'N'))))
     {
       if (li)
        li = li->next;