commit 8a3bb56230d220b8e1b4dcca517ed95f5341b8c7
author Bram Moolenaar <Bram@vim.org> Sun Mar 04 20:14:14 2018 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Mar 04 20:14:14 2018 +0100
tree e1d195050f92f44fc1993ca016c07611cb6faaa7
parent 107279c17b3a21899e0a9d0293ada040216539ba

patch 8.0.1566: too many #ifdefs

Problem:    Too many #ifdefs.
Solution:   Graduate FEAT_SCROLLBIND and FEAT_CURSORBIND.

src/macros.h

diff --git a/src/macros.h b/src/macros.h
index 43d6c94..f5440b1 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -294,19 +294,7 @@
 # define DO_AUTOCHDIR
 #endif
 
-#if defined(FEAT_SCROLLBIND) && defined(FEAT_CURSORBIND)
-# define RESET_BINDING(wp)  (wp)->w_p_scb = FALSE; (wp)->w_p_crb = FALSE
-#else
-# if defined(FEAT_SCROLLBIND)
-#  define RESET_BINDING(wp)  (wp)->w_p_scb = FALSE
-# else
-#  if defined(FEAT_CURSORBIND)
-#   define RESET_BINDING(wp)  (wp)->w_p_crb = FALSE
-#  else
-#   define RESET_BINDING(wp)
-#  endif
-# endif
-#endif
+#define RESET_BINDING(wp)  (wp)->w_p_scb = FALSE; (wp)->w_p_crb = FALSE
 
 #ifdef FEAT_DIFF
 # define PLINES_NOFILL(x) plines_nofill(x)