Permalink
Browse files

patch 8.0.0066

Problem:    when calling an operator function when 'linebreak' is set, it is
            internally reset before calling the operator function.
Solution:   Restore 'linebreak' before calling op_function(). (Christian
            Brabandt)
  • Loading branch information...
1 parent 40d3f13 commit 4a08b0dc4dd70334056fc1bf069b5e938f2ed7d5 @brammool brammool committed Nov 5, 2016
Showing with 50 additions and 4 deletions.
  1. +5 −0 src/normal.c
  2. +43 −4 src/testdir/test_normal.vim
  3. +2 −0 src/version.c
View
@@ -1995,6 +1995,11 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
break;
case OP_FUNCTION:
+#ifdef FEAT_LINEBREAK
+ /* Restore linebreak, so that when the user edits it looks as
+ * before. */
+ curwin->w_p_lbr = lbr_saved;
+#endif
op_function(oap); /* call 'operatorfunc' */
break;
@@ -35,8 +35,20 @@ func! CountSpaces(type, ...)
let @@ = reg_save
endfunc
-func! IsWindows()
- return has("win32") || has("win64") || has("win95")
+func! OpfuncDummy(type, ...)
+ " for testing operatorfunc
+ let g:opt=&linebreak
+
+ if a:0 " Invoked from Visual mode, use gv command.
+ silent exe "normal! gvy"
+ elseif a:type == 'line'
+ silent exe "normal! '[V']y"
+ else
+ silent exe "normal! `[v`]y"
+ endif
+ " Create a new dummy window
+ new
+ let g:bufnr=bufnr('%')
endfunc
fun! Test_normal00_optrans()
@@ -147,7 +159,7 @@ endfunc
func! Test_normal04_filter()
" basic filter test
" only test on non windows platform
- if IsWindows()
+ if has('win32')
return
endif
call Setup_NewWindow()
@@ -210,7 +222,7 @@ endfunc
func! Test_normal06_formatprg()
" basic test for formatprg
" only test on non windows platform
- if IsWindows()
+ if has('win32')
return
else
" uses sed to number non-empty lines
@@ -328,7 +340,34 @@ func! Test_normal09_operatorfunc()
" clean up
unmap <buffer> ,,
set opfunc=
+ unlet! g:a
+ bw!
+endfunc
+
+func! Test_normal09a_operatorfunc()
+ " Test operatorfunc
+ call Setup_NewWindow()
+ " Add some spaces for counting
+ 50,60s/$/ /
+ unlet! g:opt
+ set linebreak
+ nmap <buffer><silent> ,, :set opfunc=OpfuncDummy<CR>g@
+ 50
+ norm ,,j
+ exe "bd!" g:bufnr
+ call assert_true(&linebreak)
+ call assert_equal(g:opt, &linebreak)
+ set nolinebreak
+ norm ,,j
+ exe "bd!" g:bufnr
+ call assert_false(&linebreak)
+ call assert_equal(g:opt, &linebreak)
+
+ " clean up
+ unmap <buffer> ,,
+ set opfunc=
bw!
+ unlet! g:opt
endfunc
func! Test_normal10_expand()
View
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 66,
+/**/
65,
/**/
64,

0 comments on commit 4a08b0d

Please sign in to comment.