aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.0-129

Browse Source
This commit is contained in:
Bram Moolenaar 2006-10-10 16:28:30 +00:00
parent da68cf33d8
commit 57ac3a2163
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui_gtk.c
View File

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

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
129,
/**/ /**/
128, 128,
/**/ /**/