Mercurial > vim

diff src/normal.c @ 13384:6740c499de13 v8.0.1566

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1566: too many #ifdefs commit https://github.com/vim/vim/commit/8a3bb56230d220b8e1b4dcca517ed95f5341b8c7 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 4 20:14:14 2018 +0100 patch 8.0.1566: too many #ifdefs Problem: Too many #ifdefs. Solution: Graduate FEAT_SCROLLBIND and FEAT_CURSORBIND.
author Christian Brabandt <cb@256bit.org>
date Sun, 04 Mar 2018 20:15:05 +0100
parents 69517d67421f
children 9de2b25932eb
line wrap: on
line diff
--- a/src/normal.c
+++ b/src/normal.c
@@ -1275,21 +1275,17 @@ normal_end:
 	mb_adjust_cursor();
 #endif
 
-#ifdef FEAT_SCROLLBIND
     if (curwin->w_p_scb && toplevel)
     {
 	validate_cursor();	/* may need to update w_leftcol */
 	do_check_scrollbind(TRUE);
     }
-#endif
-
-#ifdef FEAT_CURSORBIND
+
     if (curwin->w_p_crb && toplevel)
     {
 	validate_cursor();	/* may need to update w_leftcol */
 	do_check_cursorbind();
     }
-#endif
 
 #ifdef FEAT_TERMINAL
     /* don't go to Insert mode if a terminal has a running job */
@@ -3980,7 +3976,6 @@ display_showcmd(void)
 }
 #endif
 
-#ifdef FEAT_SCROLLBIND
 /*
  * When "check" is FALSE, prepare for commands that scroll the window.
  * When "check" is TRUE, take care of scroll-binding after the window has
@@ -4139,7 +4134,6 @@ check_scrollbind(linenr_T topline_diff, 
     curwin = old_curwin;
     curbuf = old_curbuf;
 }
-#endif /* #ifdef FEAT_SCROLLBIND */
 
 /*
  * Command character that's ignored.