patch 8.1.0805: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_MBYTE, part 1.
diff --git a/src/digraph.c b/src/digraph.c
index 407b45f..d936136 100644
--- a/src/digraph.c
+++ b/src/digraph.c
@@ -15,11 +15,7 @@
#if defined(FEAT_DIGRAPHS) || defined(PROTO)
-#ifdef FEAT_MBYTE
typedef int result_T;
-#else
-typedef char_u result_T;
-#endif
typedef struct digraph
{
@@ -38,8 +34,8 @@
* compilers cannot handle them (Amiga SAS/C is the most picky one).
*/
static digr_T digraphdefault[] =
-#ifdef __MINT__
+#ifdef __MINT__
/*
* ATARI digraphs
*/
@@ -320,137 +316,7 @@
};
# else
-# if defined(MACOS_X) && !defined(FEAT_MBYTE)
-
- /*
- * Macintosh digraphs
- */
- {{'a', 't', 64}, /* @ */
- {'A', '"', 128}, /* ~@ XX */
- {'A', 'o', 129}, /* Å */
- {'C', ',', 130}, /* Ç */
- {'E', '\'', 131}, /* É */
- {'N', '~', 132}, /* Ñ */
- {'O', '"', 133}, /* Ö */
- {'U', '"', 134}, /* Ü */
- {'a', '\'', 135}, /* ~G XX */
- {'a', '`', 136}, /* ~H XX */
- {'a', '^', 137}, /* â */
- {'a', '"', 138}, /* ä */
- {'a', '~', 139}, /* ã */
- {'a', 'o', 140}, /* å */
- {'c', ',', 141}, /* ç */
- {'e', '\'', 142}, /* é */
- {'e', '`', 143}, /* è */
- {'e', '^', 144}, /* ê */
- {'e', '"', 145}, /* ë */
- {'i', '\'', 146}, /* í */
- {'i', '`', 147}, /* ì */
- {'i', '^', 148}, /* î */
- {'i', '"', 149}, /* ï */
- {'n', '~', 150}, /* ñ */
- {'o', '\'', 151}, /* ó */
- {'o', '`', 152}, /* ò */
- {'o', '^', 153}, /* ô */
- {'o', '"', 154}, /* ö */
- {'o', '~', 155}, /* o */
- {'u', '\'', 156}, /* ú */
- {'u', '`', 157}, /* ~] XX */
- {'u', '^', 158}, /* û */
- {'u', '"', 159}, /* ü */
- {'+', '_', 160}, /* Ý */
- {'~', 'o', 161}, /* ° */
- {'c', '|', 162}, /* ¢ */
- {'$', '$', 163}, /* £ */
- {'p', 'a', 164}, /* § */
- {'.', '.', 165}, /* * */
- {'P', 'P', 166}, /* ¶ */
- {'s', 's', 167}, /* ß */
- {'r', 'O', 168}, /* ® */
- {'c', 'O', 169}, /* © */
- {'T', 'M', 170}, /* */
- {'=', '/', 173}, /* */
- {'A', 'E', 174}, /* Æ */
- {'O', '/', 175}, /* Ø */
- {'0', '0', 176}, /* */
- {'+', '-', 177}, /* ± */
- {'<', '=', 178}, /* ¾ */
- {'>', '=', 179}, /* */
- {'Y', '-', 180}, /* ¥ */
- {'j', 'u', 181}, /* µ */
- {'m', 'u', 181}, /* µ */
- {'d', 'd', 182}, /* */
- {'S', 'S', 183}, /*
*/
- {'S', 'I', 183}, /*
*/
- {'P', 'I', 184}, /* ½ */
- {'p', 'i', 185}, /* ¼ */
- {'I', 'I', 186}, /* */
- {'a', '-', 187}, /* » */
- {'o', '-', 188}, /* º */
- {'O', 'M', 189}, /* ½ */
- {'a', 'e', 190}, /* æ */
- {'o', '/', 191}, /* ø */
- {'~', '?', 192}, /* ¿ */
- {'~', '!', 193}, /* ¡ */
- {'-', ',', 194}, /* ¬ */
- {'v', '-', 195}, /* ~H XX */
- {'f', '-', 196}, /* */
- {'~', '~', 197}, /* */
- {'D', 'E', 198}, /* */
- {'<', '<', 199}, /* « */
- {'>', '>', 200}, /* » */
- {'.', ':', 201}, /* */
- {'A', '`', 203}, /* À */
- {'A', '~', 204}, /* Ã */
- {'O', '~', 205}, /* Õ */
- {'O', 'E', 206}, /* */
- {'o', 'e', 207}, /* ¦ */
- {'-', '.', 208}, /* - */
- {'-', '-', 209}, /* - */
- {'`', '`', 210}, /* " */
- {'\'', '\'', 211}, /* " */
- {'`', ' ', 212}, /* ' */
- {'\'', ' ', 213}, /* ' */
- {'-', ':', 214}, /* ÷ */
- {'D', 'I', 215}, /* × */
- {'y', ':', 216}, /* ÿ */
- {'Y', ':', 217}, /* */
- {'/', '/', 218}, /* */
- {'E', '=', 219}, /* ¤ Euro System >=8.5 */
- {'o', 'x', 219}, /* ¤ Currency System <=8.1*/
- {'<', ' ', 220}, /* Ð */
- {'>', ' ', 221}, /* ð */
- {'f', 'i', 222}, /* Þ */
- {'f', 'l', 223}, /* þ */
- {'+', '+', 224}, /* ý */
- {'~', '.', 225}, /* · */
- {',', ' ', 226}, /* */
- {',', ',', 227}, /* */
- {'%', '.', 228}, /* */
- {'%', '0', 228}, /* */
- {'A', '^', 229}, /* Â */
- {'E', '^', 230}, /* Ê */
- {'A', '\'', 231}, /* Á */
- {'E', '"', 232}, /* Ë */
- {'E', '`', 233}, /* È */
- {'I', '\'', 234}, /* Í */
- {'I', '^', 235}, /* Î */
- {'I', '"', 236}, /* Ï */
- {'I', '`', 237}, /* Ì */
- {'O', '\'', 238}, /* Ó */
- {'O', '^', 239}, /* Ô */
- {'A', 'P', 240}, /* */
- {'O', '`', 241}, /* Ò */
- {'U', '\'', 242}, /* Ú */
- {'U', '^', 243}, /* Û */
- {'U', '`', 244}, /* Ù */
- {'i', '.', 245}, /* */
- {NUL, NUL, NUL}
- };
-
-# else /* !MACOS_X */
-
-# ifdef OLD_DIGRAPHS
+# ifdef OLD_DIGRAPHS
/*
* digraphs compatible with Vim 5.x
@@ -557,7 +423,7 @@
{'y', '"', 255}, /* x XX */
{NUL, NUL, NUL}
};
-# else /* OLD_DIGRAPHS */
+# else /* OLD_DIGRAPHS */
/*
* digraphs for Unicode from RFC1345
@@ -792,7 +658,6 @@
{'y', ':', 0xff},
{'y', '"', 0xff}, // x XX Vim 5.x compatible
-# ifdef FEAT_MBYTE
# define USE_UNICODE_DIGRAPHS
{'A', '-', 0x0100},
@@ -1957,14 +1822,11 @@
{'f', 'l', 0xfb02},
{'f', 't', 0xfb05},
{'s', 't', 0xfb06},
-# endif /* FEAT_MBYTE */
{NUL, NUL, NUL}
};
-# endif /* OLD_DIGRAPHS */
-
-# endif /* Macintosh */
+# endif /* OLD_DIGRAPHS */
# endif /* EBCDIC */
# endif /* !HPUX_DIGRAPHS */
#endif /* !__MINT__ */
@@ -2141,8 +2003,7 @@
++dp;
}
}
-#ifdef FEAT_MBYTE
-# ifdef USE_UNICODE_DIGRAPHS
+#ifdef USE_UNICODE_DIGRAPHS
if (retval != 0 && !enc_utf8)
{
char_u buf[6], *to;
@@ -2166,12 +2027,11 @@
(void)convert_setup(&vc, NULL, NULL);
}
}
-# endif
+#endif
/* Ignore multi-byte characters when not in multi-byte mode. */
if (!has_mbyte && retval > 0xff)
retval = 0;
-#endif
if (retval == 0) /* digraph deleted or not found */
{
@@ -2297,10 +2157,7 @@
#else
if (getexactdigraph(dp->char1, dp->char2, FALSE) == dp->result
-# ifdef FEAT_MBYTE
- && (has_mbyte || dp->result <= 255)
-# endif
- )
+ && (has_mbyte || dp->result <= 255))
printdigraph(dp, use_headers ? &previous : NULL);
#endif
++dp;
@@ -2364,11 +2221,7 @@
int list_width;
- if ((dy_flags & DY_UHEX)
-#ifdef FEAT_MBYTE
- || has_mbyte
-#endif
- )
+ if ((dy_flags & DY_UHEX) || has_mbyte)
list_width = 13;
else
list_width = 11;
@@ -2404,7 +2257,6 @@
*p = NUL;
msg_outtrans(buf);
p = buf;
-#ifdef FEAT_MBYTE
if (has_mbyte)
{
/* add a space to draw a composing char on */
@@ -2413,7 +2265,6 @@
p += (*mb_char2bytes)(dp->result, p);
}
else
-#endif
*p++ = (char_u)dp->result;
*p = NUL;
msg_outtrans_attr(buf, HL_ATTR(HLF_8));
@@ -2465,21 +2316,15 @@
/* Source the keymap file. It will contain a ":loadkeymap" command
* which will call ex_loadkeymap() below. */
- buflen = STRLEN(curbuf->b_p_keymap)
-# ifdef FEAT_MBYTE
- + STRLEN(p_enc)
-# endif
- + 14;
+ buflen = STRLEN(curbuf->b_p_keymap) + STRLEN(p_enc) + 14;
buf = alloc((unsigned)buflen);
if (buf == NULL)
return e_outofmem;
-# ifdef FEAT_MBYTE
/* try finding "keymap/'keymap'_'encoding'.vim" in 'runtimepath' */
vim_snprintf((char *)buf, buflen, "keymap/%s_%s.vim",
curbuf->b_p_keymap, p_enc);
if (source_runtime(buf, 0) == FAIL)
-# endif
{
/* try finding "keymap/'keymap'.vim" in 'runtimepath' */
vim_snprintf((char *)buf, buflen, "keymap/%s.vim",