diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-02-17 10:54:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-17 10:54:00 +0100 |
commit | 33ce70c8833a4ee0422b8865c7438fe6676cdd6c (patch) | |
tree | a3c2c7b74745729773dbac16070d43db1c8f7d09 /src/nvim/option.c | |
parent | dc9dd8d664f2ffec3d199f96e4605cb0729497ec (diff) | |
download | rneovim-33ce70c8833a4ee0422b8865c7438fe6676cdd6c.tar.gz rneovim-33ce70c8833a4ee0422b8865c7438fe6676cdd6c.tar.bz2 rneovim-33ce70c8833a4ee0422b8865c7438fe6676cdd6c.zip |
vim-patch:8.1.0932: remove Farsi support (#9622)
Problem: Farsi support is outdated and unused.
Solution: Delete the Farsi support.
https://github.com/vim/vim/commit/14184a3133b9a6ee5f711d493c04e41ba4fa7c2f
Diffstat (limited to 'src/nvim/option.c')
-rw-r--r-- | src/nvim/option.c | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index fc1fab834e..2346c84b54 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -3945,51 +3945,6 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, if (errmsg != NULL) EMSG(_(errmsg)); } - } 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; - curwin->w_p_arab = FALSE; - (void)init_chartab(); - } - - /* - * If hkmap set, reset Farsi keymapping. - */ - if (p_hkmap && p_altkeymap) { - p_altkeymap = 0; - p_fkmap = 0; - curwin->w_p_arab = FALSE; - (void)init_chartab(); - } - - /* - * If fkmap set, reset Hebrew keymapping. - */ - if (p_fkmap && !p_altkeymap) { - p_altkeymap = 1; - p_hkmap = 0; - curwin->w_p_arab = FALSE; - (void)init_chartab(); } if ((int *)varp == &curwin->w_p_arab) { @@ -4027,10 +3982,6 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, // Force-set the necessary keymap for arabic. set_option_value("keymap", 0L, "arabic", OPT_LOCAL); - p_altkeymap = 0; - p_hkmap = 0; - p_fkmap = 0; - (void)init_chartab(); } else { /* * 'arabic' is reset, handle various sub-settings. @@ -5664,8 +5615,6 @@ void 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); - /* Is this right? */ - wp_to->w_farsi = wp_from->w_farsi; } /* |