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.2-239

Browse Source
This commit is contained in:
Bram Moolenaar 2009-07-22 14:23:13 +00:00
parent 363cb67afa
commit 6ec0a6c43d
2 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/diff.c
View File

@ -893,6 +893,7 @@ ex_diffpatch(eap)
char_u *browseFile = NULL; char_u *browseFile = NULL;
int browse_flag = cmdmod.browse; int browse_flag = cmdmod.browse;
#endif #endif
struct stat st;
#ifdef FEAT_BROWSE #ifdef FEAT_BROWSE
if (cmdmod.browse) if (cmdmod.browse)
@ -999,44 +1000,51 @@ ex_diffpatch(eap)
STRCAT(buf, ".rej"); STRCAT(buf, ".rej");
mch_remove(buf); mch_remove(buf);
if (curbuf->b_fname != NULL) /* Only continue if the output file was created. */
if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
EMSG(_("E816: Cannot read patch output"));
else
{ {
newname = vim_strnsave(curbuf->b_fname, if (curbuf->b_fname != NULL)
{
newname = vim_strnsave(curbuf->b_fname,
(int)(STRLEN(curbuf->b_fname) + 4)); (int)(STRLEN(curbuf->b_fname) + 4));
if (newname != NULL) if (newname != NULL)
STRCAT(newname, ".new"); STRCAT(newname, ".new");
} }
#ifdef FEAT_GUI #ifdef FEAT_GUI
need_mouse_correct = TRUE; need_mouse_correct = TRUE;
#endif #endif
/* don't use a new tab page, each tab page has its own diffs */ /* don't use a new tab page, each tab page has its own diffs */
cmdmod.tab = 0; cmdmod.tab = 0;
if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
{
/* Pretend it was a ":split fname" command */
eap->cmdidx = CMD_split;
eap->arg = tmp_new;
do_exedit(eap, old_curwin);
if (curwin != old_curwin) /* split must have worked */
{ {
/* Set 'diff', 'scrollbind' on and 'wrap' off. */ /* Pretend it was a ":split fname" command */
diff_win_options(curwin, TRUE); eap->cmdidx = CMD_split;
diff_win_options(old_curwin, TRUE); eap->arg = tmp_new;
do_exedit(eap, old_curwin);
if (newname != NULL) /* check that split worked and editing tmp_new */
if (curwin != old_curwin && win_valid(old_curwin))
{ {
/* do a ":file filename.new" on the patched buffer */ /* Set 'diff', 'scrollbind' on and 'wrap' off. */
eap->arg = newname; diff_win_options(curwin, TRUE);
ex_file(eap); diff_win_options(old_curwin, TRUE);
if (newname != NULL)
{
/* do a ":file filename.new" on the patched buffer */
eap->arg = newname;
ex_file(eap);
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
/* Do filetype detection with the new name. */ /* Do filetype detection with the new name. */
if (au_has_group((char_u *)"filetypedetect")) if (au_has_group((char_u *)"filetypedetect"))
do_cmdline_cmd((char_u *)":doau filetypedetect BufRead"); do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
#endif #endif
}
} }
} }
} }

2
src/version.c
View File

@ -676,6 +676,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 */
/**/
239,
/**/ /**/
238, 238,
/**/ /**/