|
 |
8b9a1c |
To: vim_dev@googlegroups.com
|
|
|
8b9a1c |
Subject: Patch 7.4.109
|
|
|
8b9a1c |
Fcc: outbox
|
|
|
8b9a1c |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
8b9a1c |
Mime-Version: 1.0
|
|
|
8b9a1c |
Content-Type: text/plain; charset=UTF-8
|
|
|
8b9a1c |
Content-Transfer-Encoding: 8bit
|
|
|
8b9a1c |
------------
|
|
|
8b9a1c |
|
|
|
8b9a1c |
Patch 7.4.109
|
|
|
8b9a1c |
Problem: ColorScheme autocommand matches with the current buffer name.
|
|
|
8b9a1c |
Solution: Match with the colorscheme name. (Christian Brabandt)
|
|
|
8b9a1c |
Files: runtime/doc/autocmd.txt, src/fileio.c, src/syntax.c
|
|
|
8b9a1c |
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.108/runtime/doc/autocmd.txt 2013-08-10 13:24:52.000000000 +0200
|
|
|
8b9a1c |
--- runtime/doc/autocmd.txt 2013-11-28 18:44:20.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 480,485 ****
|
|
|
8b9a1c |
--- 480,491 ----
|
|
|
8b9a1c |
|cmdwin-char|
|
|
|
8b9a1c |
*ColorScheme*
|
|
|
8b9a1c |
ColorScheme After loading a color scheme. |:colorscheme|
|
|
|
8b9a1c |
+ The pattern is matched against the
|
|
|
8b9a1c |
+ colorscheme name. <afile> can be used for the
|
|
|
8b9a1c |
+ name of the actual file where this option was
|
|
|
8b9a1c |
+ set, and <amatch> for the new colorscheme
|
|
|
8b9a1c |
+ name.
|
|
|
8b9a1c |
+
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*CompleteDone*
|
|
|
8b9a1c |
CompleteDone After Insert mode completion is done. Either
|
|
|
8b9a1c |
*** ../vim-7.4.108/src/fileio.c 2013-11-12 18:09:20.000000000 +0100
|
|
|
8b9a1c |
--- src/fileio.c 2013-11-28 18:44:20.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 9330,9336 ****
|
|
|
8b9a1c |
*/
|
|
|
8b9a1c |
if (fname_io == NULL)
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
! if (fname != NULL && *fname != NUL)
|
|
|
8b9a1c |
autocmd_fname = fname;
|
|
|
8b9a1c |
else if (buf != NULL)
|
|
|
8b9a1c |
autocmd_fname = buf->b_ffname;
|
|
|
8b9a1c |
--- 9330,9338 ----
|
|
|
8b9a1c |
*/
|
|
|
8b9a1c |
if (fname_io == NULL)
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
! if (event == EVENT_COLORSCHEME)
|
|
|
8b9a1c |
! autocmd_fname = NULL;
|
|
|
8b9a1c |
! else if (fname != NULL && *fname != NUL)
|
|
|
8b9a1c |
autocmd_fname = fname;
|
|
|
8b9a1c |
else if (buf != NULL)
|
|
|
8b9a1c |
autocmd_fname = buf->b_ffname;
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 9383,9396 ****
|
|
|
8b9a1c |
else
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
sfname = vim_strsave(fname);
|
|
|
8b9a1c |
! /* Don't try expanding FileType, Syntax, FuncUndefined, WindowID or
|
|
|
8b9a1c |
! * QuickFixCmd* */
|
|
|
8b9a1c |
if (event == EVENT_FILETYPE
|
|
|
8b9a1c |
|| event == EVENT_SYNTAX
|
|
|
8b9a1c |
|| event == EVENT_FUNCUNDEFINED
|
|
|
8b9a1c |
|| event == EVENT_REMOTEREPLY
|
|
|
8b9a1c |
|| event == EVENT_SPELLFILEMISSING
|
|
|
8b9a1c |
|| event == EVENT_QUICKFIXCMDPRE
|
|
|
8b9a1c |
|| event == EVENT_QUICKFIXCMDPOST)
|
|
|
8b9a1c |
fname = vim_strsave(fname);
|
|
|
8b9a1c |
else
|
|
|
8b9a1c |
--- 9385,9399 ----
|
|
|
8b9a1c |
else
|
|
|
8b9a1c |
{
|
|
|
8b9a1c |
sfname = vim_strsave(fname);
|
|
|
8b9a1c |
! /* Don't try expanding FileType, Syntax, FuncUndefined, WindowID,
|
|
|
8b9a1c |
! * ColorScheme or QuickFixCmd* */
|
|
|
8b9a1c |
if (event == EVENT_FILETYPE
|
|
|
8b9a1c |
|| event == EVENT_SYNTAX
|
|
|
8b9a1c |
|| event == EVENT_FUNCUNDEFINED
|
|
|
8b9a1c |
|| event == EVENT_REMOTEREPLY
|
|
|
8b9a1c |
|| event == EVENT_SPELLFILEMISSING
|
|
|
8b9a1c |
|| event == EVENT_QUICKFIXCMDPRE
|
|
|
8b9a1c |
+ || event == EVENT_COLORSCHEME
|
|
|
8b9a1c |
|| event == EVENT_QUICKFIXCMDPOST)
|
|
|
8b9a1c |
fname = vim_strsave(fname);
|
|
|
8b9a1c |
else
|
|
|
8b9a1c |
*** ../vim-7.4.108/src/syntax.c 2013-06-08 16:10:08.000000000 +0200
|
|
|
8b9a1c |
--- src/syntax.c 2013-11-28 18:44:20.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 7071,7077 ****
|
|
|
8b9a1c |
retval = source_runtime(buf, FALSE);
|
|
|
8b9a1c |
vim_free(buf);
|
|
|
8b9a1c |
#ifdef FEAT_AUTOCMD
|
|
|
8b9a1c |
! apply_autocmds(EVENT_COLORSCHEME, NULL, NULL, FALSE, curbuf);
|
|
|
8b9a1c |
#endif
|
|
|
8b9a1c |
}
|
|
|
8b9a1c |
recursive = FALSE;
|
|
|
8b9a1c |
--- 7071,7077 ----
|
|
|
8b9a1c |
retval = source_runtime(buf, FALSE);
|
|
|
8b9a1c |
vim_free(buf);
|
|
|
8b9a1c |
#ifdef FEAT_AUTOCMD
|
|
|
8b9a1c |
! apply_autocmds(EVENT_COLORSCHEME, name, curbuf->b_fname, FALSE, curbuf);
|
|
|
8b9a1c |
#endif
|
|
|
8b9a1c |
}
|
|
|
8b9a1c |
recursive = FALSE;
|
|
|
8b9a1c |
*** ../vim-7.4.108/src/version.c 2013-11-28 17:41:41.000000000 +0100
|
|
|
8b9a1c |
--- src/version.c 2013-11-28 18:48:42.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 740,741 ****
|
|
|
8b9a1c |
--- 740,743 ----
|
|
|
8b9a1c |
{ /* Add new patch number below this line */
|
|
|
8b9a1c |
+ /**/
|
|
|
8b9a1c |
+ 109,
|
|
|
8b9a1c |
/**/
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--
|
|
|
8b9a1c |
"How is your new girlfriend?"
|
|
|
8b9a1c |
"90-60-90 man!"
|
|
|
8b9a1c |
"What, pale purple?"
|
|
|
8b9a1c |
|
|
|
8b9a1c |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
8b9a1c |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
8b9a1c |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
8b9a1c |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|