summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-11-24 18:48:12 +0100
committerBram Moolenaar <Bram@vim.org>2010-11-24 18:48:12 +0100
commitdf6b11e95593b5c2ff7690645ffbbb0702ca1c9f (patch)
treee4bc55a2ded61ffa9ac37dd01e2713691e0ac37a
parentf666f0e5c07723c77cb9bc34034542a3c6106e4e (diff)
downloadvim-git-df6b11e95593b5c2ff7690645ffbbb0702ca1c9f.tar.gz
updated for version 7.3.069v7.3.069
Problem: GTK: pressing Enter in inputdialog() doesn't work like clicking OK as documented. Solution: call gtk_entry_set_activates_default(). (Britton Kerin)
-rw-r--r--src/gui_gtk.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 1533c647c..326a30cff 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -1287,6 +1287,9 @@ gui_mch_dialog(int type, /* type of dialog */
entry = gtk_entry_new();
gtk_widget_show(entry);
+ /* Make Enter work like pressing OK. */
+ gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
+
text = CONVERT_TO_UTF8(textfield);
gtk_entry_set_text(GTK_ENTRY(entry), (const char *)text);
CONVERT_TO_UTF8_FREE(text);
diff --git a/src/version.c b/src/version.c
index d92f09040..3dfb975de 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 69,
+/**/
68,
/**/
67,