comparison src/fileio.c @ 5521:1cdf51706774 v7.4.109

updated for version 7.4.109 Problem: ColorScheme autocommand matches with the current buffer name. Solution: Match with the colorscheme name. (Christian Brabandt)
author Bram Moolenaar <bram@vim.org>
date Thu, 28 Nov 2013 18:53:52 +0100
parents 9502d1caf90b
children 391e10afccf6
comparison
equal deleted inserted replaced
5520:86861620ba96 5521:1cdf51706774
9328 * Make a copy to avoid that changing a buffer name or directory makes it 9328 * Make a copy to avoid that changing a buffer name or directory makes it
9329 * invalid. 9329 * invalid.
9330 */ 9330 */
9331 if (fname_io == NULL) 9331 if (fname_io == NULL)
9332 { 9332 {
9333 if (fname != NULL && *fname != NUL) 9333 if (event == EVENT_COLORSCHEME)
9334 autocmd_fname = NULL;
9335 else if (fname != NULL && *fname != NUL)
9334 autocmd_fname = fname; 9336 autocmd_fname = fname;
9335 else if (buf != NULL) 9337 else if (buf != NULL)
9336 autocmd_fname = buf->b_ffname; 9338 autocmd_fname = buf->b_ffname;
9337 else 9339 else
9338 autocmd_fname = NULL; 9340 autocmd_fname = NULL;
9381 fname = vim_strsave(fname); /* make a copy, so we can change it */ 9383 fname = vim_strsave(fname); /* make a copy, so we can change it */
9382 } 9384 }
9383 else 9385 else
9384 { 9386 {
9385 sfname = vim_strsave(fname); 9387 sfname = vim_strsave(fname);
9386 /* Don't try expanding FileType, Syntax, FuncUndefined, WindowID or 9388 /* Don't try expanding FileType, Syntax, FuncUndefined, WindowID,
9387 * QuickFixCmd* */ 9389 * ColorScheme or QuickFixCmd* */
9388 if (event == EVENT_FILETYPE 9390 if (event == EVENT_FILETYPE
9389 || event == EVENT_SYNTAX 9391 || event == EVENT_SYNTAX
9390 || event == EVENT_FUNCUNDEFINED 9392 || event == EVENT_FUNCUNDEFINED
9391 || event == EVENT_REMOTEREPLY 9393 || event == EVENT_REMOTEREPLY
9392 || event == EVENT_SPELLFILEMISSING 9394 || event == EVENT_SPELLFILEMISSING
9393 || event == EVENT_QUICKFIXCMDPRE 9395 || event == EVENT_QUICKFIXCMDPRE
9396 || event == EVENT_COLORSCHEME
9394 || event == EVENT_QUICKFIXCMDPOST) 9397 || event == EVENT_QUICKFIXCMDPOST)
9395 fname = vim_strsave(fname); 9398 fname = vim_strsave(fname);
9396 else 9399 else
9397 fname = FullName_save(fname, FALSE); 9400 fname = FullName_save(fname, FALSE);
9398 } 9401 }