From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 14 Aug 2007 13:00:40 +0000 (+0000)
Subject: updated for version 7.1-069
X-Git-Tag: v7.1.069
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2c765e688426a98583d73f1e8b971cd5e37940b;p=vim

updated for version 7.1-069
---

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 094769d4b..cfba5c764 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -1630,11 +1630,14 @@ dlg_button_clicked(GtkWidget * widget, ButtonData *data)
  */
 /*ARGSUSED*/
     static int
-dlg_key_press_event(GtkWidget * widget, GdkEventKey * event, CancelData *data)
+dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data)
 {
-    /* Ignore hitting Enter when there is no default button. */
-    if (data->ignore_enter && event->keyval == GDK_Return)
+    /* Ignore hitting Enter (or Space) when there is no default button. */
+    if (data->ignore_enter && (event->keyval == GDK_Return
+						     || event->keyval == ' '))
 	return TRUE;
+    else    /* A different key was pressed, return to normal behavior */
+	data->ignore_enter = FALSE;
 
     if (event->keyval != GDK_Escape && event->keyval != GDK_Return)
 	return FALSE;
@@ -2224,6 +2227,13 @@ dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
     DialogInfo *di = (DialogInfo *)data;
 
+    /* Ignore hitting Enter (or Space) when there is no default button. */
+    if (di->ignore_enter && (event->keyval == GDK_Return
+						     || event->keyval == ' '))
+	return TRUE;
+    else    /* A different key was pressed, return to normal behavior */
+	di->ignore_enter = FALSE;
+
     /* Close the dialog when hitting "Esc". */
     if (event->keyval == GDK_Escape)
     {
diff --git a/src/version.c b/src/version.c
index fb80f28fc..fce1bcd28 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    69,
 /**/
     68,
 /**/