summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui_gtk.c9
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 0 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index b321da0d58..c1b0479749 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -2193,6 +2193,15 @@ find_replace_dialog_create(char_u *arg, int do_replace)
#endif
}
gtk_window_present(GTK_WINDOW(frdp->dialog));
+
+ /* For :promptfind dialog, always give keyboard focus to 'what' entry.
+ * For :promptrepl dialog, give it to 'with' entry if 'what' has an
+ * non-empty entry; otherwise, to 'what' entry. */
+ gtk_widget_grab_focus(frdp->what);
+ if (do_replace && gtk_entry_get_text_length(GTK_ENTRY(frdp->what)))
+ gtk_widget_grab_focus(frdp->with);
+
+
vim_free(entry_text);
return;
}
diff --git a/src/version.c b/src/version.c
index 6ebb01a396..bace9d3c64 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1434,
+/**/
1433,
/**/
1432,