mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 01:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0179

Browse Source 
Problem:    'formatprg' is a global option but the value may depend on the
            type of buffer. (Sung Pae)
Solution:   Make 'formatprg' global-local. (closes vim/vim#1380)

9be7c04e6c
This commit is contained in:
raichoo
2017-03-09 17:33:51 +01:00
parent 2ad25c0466
commit 0f5c3f111a
7 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/normal.c
View File

@@ -1901,12 +1901,13 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
break;
case OP_FORMAT:
if (*curbuf->b_p_fex != NUL)
op_formatexpr(oap); /* use expression */
else if (*p_fp != NUL)
op_colon(oap); /* use external command */
else
op_format(oap, false); /* use internal function */
if (*curbuf->b_p_fex != NUL) {
op_formatexpr(oap); // use expression
} else if (*p_fp != NUL || *curbuf->b_p_fp != NUL) {
op_colon(oap); // use external command
} else {
op_format(oap, false); // use internal function
}
break;
case OP_FORMAT2:
@@ -2064,10 +2065,13 @@ static void op_colon(oparg_T *oap)
stuffReadbuff(get_equalprg());
stuffReadbuff((char_u *)"\n");
} else if (oap->op_type == OP_FORMAT) {
if (*p_fp == NUL)
stuffReadbuff((char_u *)"fmt");
else
if (*curbuf->b_p_fp != NUL) {
stuffReadbuff(curbuf->b_p_fp);
} else if (*p_fp != NUL) {
stuffReadbuff(p_fp);
} else {
stuffReadbuff((char_u *)"fmt");
}
stuffReadbuff((char_u *)"\n']");
}