patch 8.2.4694: avoidance of #elif causes more preproc nesting
Problem: Avoidance of #elif causes more preproc nesting.
Solution: Use #elif where it is useful. (Ozaki Kiichi, closes #10081)
diff --git a/src/optiondefs.h b/src/optiondefs.h
index 9eb0e78..4f2ec4d 100644
--- a/src/optiondefs.h
+++ b/src/optiondefs.h
@@ -1148,21 +1148,17 @@
#ifdef FEAT_QUICKFIX
(char_u *)&p_gp, PV_GP,
{
-# ifdef MSWIN
+# if defined(MSWIN)
// may be changed to "grep -n" in os_win32.c
(char_u *)"findstr /n",
-# else
-# ifdef UNIX
+# elif defined(UNIX)
// Add an extra file name so that grep will always
// insert a file name in the match line.
(char_u *)"grep -n $* /dev/null",
-# else
-# ifdef VMS
+# elif defined(VMS)
(char_u *)"SEARCH/NUMBERS ",
-# else
+# else
(char_u *)"grep -n ",
-# endif
-# endif
# endif
(char_u *)0L}
#else
@@ -1431,14 +1427,12 @@
// ( and ) are used in text separating fnames
(char_u *)"@,48-57,/,\\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,=",
#else
-# ifdef AMIGA
+# if defined(AMIGA)
(char_u *)"@,48-57,/,.,-,_,+,,,$,:",
-# else
-# ifdef VMS
+# elif defined(VMS)
(char_u *)"@,48-57,/,.,-,_,+,,,#,$,%,<,>,[,],:,;,~",
-# else // UNIX et al.
+# else // UNIX et al.
(char_u *)"@,48-57,/,.,-,_,+,,,#,$,%,~,=",
-# endif
# endif
#endif
(char_u *)0L} SCTX_INIT},
@@ -1497,18 +1491,14 @@
{"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
(char_u *)&p_kp, PV_KP,
{
-#ifdef MSWIN
+#if defined(MSWIN)
(char_u *)":help",
-#else
-# ifdef VMS
+#elif defined(VMS)
(char_u *)"help",
-# else
-# ifdef USEMAN_S
+#elif defined(USEMAN_S)
(char_u *)"man -s",
-# else
+#else
(char_u *)"man",
-# endif
-# endif
#endif
(char_u *)0L} SCTX_INIT},
{"langmap", "lmap", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_SECURE,
@@ -2767,13 +2757,11 @@
(char_u *)&p_viminfo, PV_NONE,
#if defined(MSWIN)
{(char_u *)"", (char_u *)"'100,<50,s10,h,rA:,rB:"}
-#else
-# ifdef AMIGA
+#elif defined(AMIGA)
{(char_u *)"",
(char_u *)"'100,<50,s10,h,rdf0:,rdf1:,rdf2:"}
-# else
+#else
{(char_u *)"", (char_u *)"'100,<50,s10,h"}
-# endif
#endif
#else
(char_u *)NULL, PV_NONE,