diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-04-03 17:59:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-04-03 17:59:43 +0200 |
| commit | f6303878274b9aedfb9ac5b80d95002965093e5b (patch) | |
| tree | 12b3b1bb22c5e4757ec560500a0637be1141d691 | |
| parent | da6365774d658b66f8d337f6342f4077594dd494 (diff) | |
| download | vim-f6303878274b9aedfb9ac5b80d95002965093e5b.zip | |
patch 7.4.691 for Problem: Can't build with MzScheme.
Solution: Change "cwd" into the global variable "start_dir".
| -rw-r--r-- | src/main.c | 25 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/main.c b/src/main.c index 58062c392..72f70b714 100644 --- a/src/main.c +++ b/src/main.c @@ -147,6 +147,8 @@ static char *(main_errors[]) = #define ME_INVALID_ARG 5 }; +static char_u *start_dir = NULL; /* current working dir on startup */ + #ifndef PROTO /* don't want a prototype for main() */ #ifndef NO_VIM_MAIN /* skip this for unittests */ int @@ -168,7 +170,6 @@ main char_u *fname = NULL; /* file name from command line */ mparm_T params; /* various parameters passed between * main() and other functions. */ - char_u *cwd = NULL; /* current workding dir on startup */ #ifdef STARTUPTIME int i; #endif @@ -405,17 +406,17 @@ main */ if (!params.literal) { - cwd = alloc(MAXPATHL); - if (cwd != NULL) - mch_dirname(cwd, MAXPATHL); + start_dir = alloc(MAXPATHL); + if (start_dir != NULL) + mch_dirname(start_dir, MAXPATHL); /* Temporarily add '(' and ')' to 'isfname'. These are valid * filename characters but are excluded from 'isfname' to make * "gf" work on a file name in parenthesis (e.g.: see vim.h). */ do_cmdline_cmd((char_u *)":set isf+=(,)"); alist_expand(NULL, 0); do_cmdline_cmd((char_u *)":set isf&"); - if (cwd != NULL) - mch_chdir((char *)cwd); + if (start_dir != NULL) + mch_chdir((char *)start_dir); } #endif fname = alist_name(&GARGLIST[0]); @@ -441,8 +442,8 @@ main * If the cd fails, it doesn't matter. */ (void)vim_chdirfile(fname); - if (cwd != NULL) - mch_dirnamem(cwd, MAXPATHL); + if (start_dir != NULL) + mch_dirname(start_dir, MAXPATHL); } #endif TIME_MSG("expanding arguments"); @@ -496,8 +497,8 @@ main expand_env((char_u *)"$HOME", NameBuff, MAXPATHL); vim_chdir(NameBuff); } - if (cwd != NULL) - mch_dirname(cwd, MAXPATHL); + if (start_dir != NULL) + mch_dirname(start_dir, MAXPATHL); } } #endif @@ -910,9 +911,9 @@ vim_main2(int argc UNUSED, char **argv UNUSED) * If opened more than one window, start editing files in the other * windows. */ - edit_buffers(¶ms, cwd); + edit_buffers(¶ms, start_dir); #endif - vim_free(cwd); + vim_free(start_dir); #ifdef FEAT_DIFF if (params.diff_mode) diff --git a/src/version.c b/src/version.c index a847921c0..1ae5f37e9 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 691, +/**/ 690, /**/ 689, |