diff options
Diffstat (limited to 'src/option.c')
| -rw-r--r-- | src/option.c | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/src/option.c b/src/option.c index c8808be041..b9fe3dabef 100644 --- a/src/option.c +++ b/src/option.c @@ -542,11 +542,7 @@ static struct vimoption options[] = #endif {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"altkeymap", "akm", P_BOOL|P_VI_DEF, -#ifdef FEAT_FKMAP - (char_u *)&p_altkeymap, PV_NONE, -#else (char_u *)NULL, PV_NONE, -#endif {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"ambiwidth", "ambw", P_STRING|P_VI_DEF|P_RCLR, (char_u *)&p_ambw, PV_NONE, @@ -1141,11 +1137,7 @@ static struct vimoption options[] = (char_u *)&p_fixeol, PV_FIXEOL, {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, {"fkmap", "fk", P_BOOL|P_VI_DEF, -#ifdef FEAT_FKMAP - (char_u *)&p_fkmap, PV_NONE, -#else (char_u *)NULL, PV_NONE, -#endif {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"flash", "fl", P_BOOL|P_VI_DEF, (char_u *)NULL, PV_NONE, @@ -8707,69 +8699,6 @@ set_bool_option( } #endif -#ifdef FEAT_FKMAP - else if ((int *)varp == &p_altkeymap) - { - if (old_value != p_altkeymap) - { - if (!p_altkeymap) - { - p_hkmap = p_fkmap; - p_fkmap = 0; - } - else - { - p_fkmap = p_hkmap; - p_hkmap = 0; - } - (void)init_chartab(); - } - } - - /* - * In case some second language keymapping options have changed, check - * and correct the setting in a consistent way. - */ - - /* - * If hkmap or fkmap are set, reset Arabic keymapping. - */ - if ((p_hkmap || p_fkmap) && p_altkeymap) - { - p_altkeymap = p_fkmap; -# ifdef FEAT_ARABIC - curwin->w_p_arab = FALSE; -# endif - (void)init_chartab(); - } - - /* - * If hkmap set, reset Farsi keymapping. - */ - if (p_hkmap && p_altkeymap) - { - p_altkeymap = 0; - p_fkmap = 0; -# ifdef FEAT_ARABIC - curwin->w_p_arab = FALSE; -# endif - (void)init_chartab(); - } - - /* - * If fkmap set, reset Hebrew keymapping. - */ - if (p_fkmap && !p_altkeymap) - { - p_altkeymap = 1; - p_hkmap = 0; -# ifdef FEAT_ARABIC - curwin->w_p_arab = FALSE; -# endif - (void)init_chartab(); - } -#endif - #ifdef FEAT_ARABIC if ((int *)varp == &curwin->w_p_arab) { @@ -8816,12 +8745,6 @@ set_bool_option( set_option_value((char_u *)"keymap", 0L, (char_u *)"arabic", OPT_LOCAL); # endif -# ifdef FEAT_FKMAP - p_altkeymap = 0; - p_hkmap = 0; - p_fkmap = 0; - (void)init_chartab(); -# endif } else { @@ -11085,12 +11008,6 @@ win_copy_options(win_T *wp_from, win_T *wp_to) { copy_winopt(&wp_from->w_onebuf_opt, &wp_to->w_onebuf_opt); copy_winopt(&wp_from->w_allbuf_opt, &wp_to->w_allbuf_opt); -# ifdef FEAT_RIGHTLEFT -# ifdef FEAT_FKMAP - /* Is this right? */ - wp_to->w_farsi = wp_from->w_farsi; -# endif -# endif #if defined(FEAT_LINEBREAK) briopt_check(wp_to); #endif |