IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.515

Browse Source 
Problem:    In a help buffer the global 'foldmethod' is used.  (Paul Marshall)
Solution:   Reset 'foldmethod' when starting to edit a help file.  Move the
            code to a separate function.

https://github.com/vim/vim/releases/tag/v7-4-515
This commit is contained in:
David Bürgin 2015-03-28 18:33:00 +01:00
parent 3e6989b5ec
commit db90dcb6fd
2 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/nvim/ex_cmds.c
View File

@ -2790,50 +2790,12 @@ do_ecmd (
oldbuf = (flags & ECMD_OLDBUF);
}
buf = curbuf;
if ((flags & ECMD_SET_HELP) || keep_help_flag) {
char_u *p;
curbuf->b_help = true;
set_string_option_direct((char_u *)"buftype", -1,
(char_u *)"help", OPT_FREE|OPT_LOCAL, 0);
/*
* Always set these options after jumping to a help tag, because the
* user may have an autocommand that gets in the way.
* Accept all ASCII chars for keywords, except ' ', '*', '"', '|', and
* latin1 word characters (for translated help files).
* Only set it when needed, buf_init_chartab() is some work.
*/
p =
(char_u *)"!-~,^*,^|,^\",192-255";
if (STRCMP(curbuf->b_p_isk, p) != 0) {
set_string_option_direct((char_u *)"isk", -1, p,
OPT_FREE|OPT_LOCAL, 0);
check_buf_options(curbuf);
(void)buf_init_chartab(curbuf, FALSE);
}
curbuf->b_p_ts = 8; /* 'tabstop' is 8 */
curwin->w_p_list = FALSE; /* no list mode */
curbuf->b_p_ma = FALSE; /* not modifiable */
curbuf->b_p_bin = FALSE; /* reset 'bin' before reading file */
curwin->w_p_nu = 0; /* no line numbers */
curwin->w_p_rnu = 0; /* no relative line numbers */
RESET_BINDING(curwin); /* no scroll or cursor binding */
curwin->w_p_arab = FALSE; /* no arabic mode */
curwin->w_p_rl = FALSE; /* help window is left-to-right */
curwin->w_p_fen = FALSE; /* No folding in the help window */
curwin->w_p_diff = FALSE; /* No 'diff' */
curwin->w_p_spell = FALSE; /* No spell checking */
buf = curbuf;
set_buflisted(FALSE);
} else {
buf = curbuf;
/* Don't make a buffer listed if it's a help buffer. Useful when
* using CTRL-O to go back to a help file. */
if (!curbuf->b_help)
prepare_help_buffer();
} else if (!curbuf->b_help) {
// Don't make a buffer listed if it's a help buffer. Useful when using
// CTRL-O to go back to a help file.
set_buflisted(TRUE);
}
@ -5046,6 +5008,46 @@ int find_help_tags(char_u *arg, int *num_matches, char_u ***matches, int keep_la
return OK;
}
/// Called when starting to edit a buffer for a help file.
static void prepare_help_buffer(void)
{
curbuf->b_help = true;
set_string_option_direct((char_u *)"buftype", -1, (char_u *)"help",
OPT_FREE|OPT_LOCAL, 0);
// Always set these options after jumping to a help tag, because the
// user may have an autocommand that gets in the way.
// Accept all ASCII chars for keywords, except ' ', '*', '"', '|', and
// latin1 word characters (for translated help files).
// Only set it when needed, buf_init_chartab() is some work.
char_u *p = (char_u *)"!-~,^*,^|,^\",192-255";
if (STRCMP(curbuf->b_p_isk, p) != 0) {
set_string_option_direct((char_u *)"isk", -1, p, OPT_FREE|OPT_LOCAL, 0);
check_buf_options(curbuf);
(void)buf_init_chartab(curbuf, FALSE);
}
// Don't use the global foldmethod.
set_string_option_direct((char_u *)"fdm", -1, (char_u *)"manual",
OPT_FREE|OPT_LOCAL, 0);
curbuf->b_p_ts = 8; // 'tabstop' is 8.
curwin->w_p_list = FALSE; // No list mode.
curbuf->b_p_ma = FALSE; // Not modifiable.
curbuf->b_p_bin = FALSE; // Reset 'bin' before reading file.
curwin->w_p_nu = 0; // No line numbers.
curwin->w_p_rnu = 0; // No relative line numbers.
RESET_BINDING(curwin); // No scroll or cursor binding.
curwin->w_p_arab = FALSE; // No arabic mode.
curwin->w_p_rl = FALSE; // Help window is left-to-right.
curwin->w_p_fen = FALSE; // No folding in the help window.
curwin->w_p_diff = FALSE; // No 'diff'.
curwin->w_p_spell = FALSE; // No spell checking.
set_buflisted(FALSE);
}
/*
* After reading a help file: May cleanup a help buffer when syntax
* highlighting is not used.

2
src/nvim/version.c
View File

@ -225,7 +225,7 @@ static int included_patches[] = {
518,
517,
516,
//515,
515,
514,
513,
//512 NA