updated for version 7.0-129

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 8751615bf28194c650102fca804d38634603ec48..29ef7e367ea66b6f853df11712f3576916d17a33 100644 (file)
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -1275,18 +1275,13 @@ gui_mch_browse(int saving,
     title = CONVERT_TO_UTF8(title);
 # endif
 
-    /* Concatenate "initdir" and "dflt". */
+    /* GTK has a bug, it only works with an absolute path. */
     if (initdir == NULL || *initdir == NUL)
        mch_dirname(dirbuf, MAXPATHL);
-    else if (STRLEN(initdir) + 2 < MAXPATHL)
-       STRCPY(dirbuf, initdir);
-    else
+    else if (vim_FullName(initdir, dirbuf, MAXPATHL - 2, FALSE) == FAIL)
        dirbuf[0] = NUL;
     /* Always need a trailing slash for a directory. */
     add_pathsep(dirbuf);
-    if (dflt != NULL && *dflt != NUL
-                             && STRLEN(dirbuf) + 2 + STRLEN(dflt) < MAXPATHL)
-       STRCAT(dirbuf, dflt);
 
     /* If our pointer is currently hidden, then we should show it. */
     gui_mch_mousehide(FALSE);
@@ -1341,6 +1336,11 @@ gui_mch_browse(int saving,
     else
        gtk_window_set_title(GTK_WINDOW(gui.filedlg), (const gchar *)title);
 
+    /* Concatenate "initdir" and "dflt". */
+    if (dflt != NULL && *dflt != NUL
+                             && STRLEN(dirbuf) + 2 + STRLEN(dflt) < MAXPATHL)
+       STRCAT(dirbuf, dflt);
+
     gtk_file_selection_set_filename(GTK_FILE_SELECTION(gui.filedlg),
                                                      (const gchar *)dirbuf);
 # ifndef HAVE_GTK2

diff --git a/src/version.c b/src/version.c
index 13e3e422b4339bf40b19e7b11d26c52f9f172807..cab8d68789307d9f4a5d6a53a95a6a30f2faa075 100644 (file)
--- 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 */
+/**/
+    129,
 /**/
     128,
 /**/