patch 8.1.0805: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_MBYTE, part 1.
diff --git a/src/gui_photon.c b/src/gui_photon.c
index 77d7873..234d250 100644
--- a/src/gui_photon.c
+++ b/src/gui_photon.c
@@ -513,13 +513,8 @@
if (special_keys[i].key_sym == 0)
{
ch = PhTo8859_1(key);
- if (ch == -1
-#ifdef FEAT_MBYTE
- || (enc_utf8 && ch > 127)
-#endif
- )
+ if (ch == -1 || (enc_utf8 && ch > 127))
{
-#ifdef FEAT_MBYTE
len = PhKeyToMb(string, key);
if (len > 0)
{
@@ -546,7 +541,6 @@
return Pt_CONSUME;
}
len = 0;
-#endif
ch = key->key_cap;
if (ch < 0xff)
{
@@ -1074,7 +1068,6 @@
/****************************************************************************/
-#ifdef FEAT_MBYTE
void
gui_ph_encoding_changed(int new_encoding)
{
@@ -1100,7 +1093,6 @@
charset_translate = PxTranslateSet(charset_translate, charset);
}
-#endif
/****************************************************************************/
/****************************************************************************/
@@ -2141,11 +2133,7 @@
if (flags & DRAW_UNDERL)
PgSetUnderline(gui.norm_pixel, Pg_TRANSPARENT, 0);
- if (charset_translate != NULL
-#ifdef FEAT_MBYTE
- && enc_utf8 == 0
-#endif
- )
+ if (charset_translate != NULL && enc_utf8 == 0)
{
int src_taken, dst_made;