Mercurial > vim
diff src/gui_photon.c @ 15595:1ec942f1b648 v8.1.0805
patch 8.1.0805: too many #ifdefs
commit https://github.com/vim/vim/commit/135059724f140ceac889c9f8136bd1bf5c41d49d
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 24 15:04:48 2019 +0100
patch 8.1.0805: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_MBYTE, part 1.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 24 Jan 2019 15:15:06 +0100 |
parents | 55ccc2d353bd |
children | 31367ce5aac7 |
line wrap: on
line diff
--- a/src/gui_photon.c +++ b/src/gui_photon.c @@ -513,13 +513,8 @@ gui_ph_handle_keyboard(PtWidget_t *widge 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 @@ gui_ph_handle_keyboard(PtWidget_t *widge return Pt_CONSUME; } len = 0; -#endif ch = key->key_cap; if (ch < 0xff) { @@ -1074,7 +1068,6 @@ gui_ph_pane_resize(PtWidget_t *widget, v /****************************************************************************/ -#ifdef FEAT_MBYTE void gui_ph_encoding_changed(int new_encoding) { @@ -1100,7 +1093,6 @@ gui_ph_encoding_changed(int new_encoding charset_translate = PxTranslateSet(charset_translate, charset); } -#endif /****************************************************************************/ /****************************************************************************/ @@ -2141,11 +2133,7 @@ gui_mch_draw_string(int row, int col, ch 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;