diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-08-14 13:00:40 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-08-14 13:00:40 +0000 |
| commit | d2c765e688426a98583d73f1e8b971cd5e37940b (patch) | |
| tree | be5a9d303eaed333383f67c9808e52f43bc75fdb | |
| parent | 67f7131efa985e51e2fe3f8be9524cc767f7d827 (diff) | |
updated for version 7.1-069v7.1.069
| -rw-r--r-- | src/gui_gtk.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c index 094769d4b9..cfba5c7647 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 fb80f28fcb..fce1bcd28c 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 69, +/**/ 68, /**/ 67, |