Mercurial > vim

comparison src/option.c @ 15850:a6ca8cf07a98 v8.1.0932

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0932: Farsi support is outdated and unused commit https://github.com/vim/vim/commit/14184a3133b9a6ee5f711d493c04e41ba4fa7c2f Author: Bram Moolenaar <Bram@vim.org> Date: Sat Feb 16 15:10:30 2019 +0100 patch 8.1.0932: Farsi support is outdated and unused Problem: Farsi support is outdated and unused. Solution: Delete the Farsi support.
author Bram Moolenaar <Bram@vim.org>
date Sat, 16 Feb 2019 15:15:07 +0100
parents c017195b121b
children 3a45b89639fb
comparison
equal deleted inserted replaced
15849:c478f5603556 15850:a6ca8cf07a98
540 #else 540 #else
541 (char_u *)NULL, PV_NONE, 541 (char_u *)NULL, PV_NONE,
542 #endif 542 #endif
543 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 543 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
544 {"altkeymap", "akm", P_BOOL|P_VI_DEF, 544 {"altkeymap", "akm", P_BOOL|P_VI_DEF,
545 #ifdef FEAT_FKMAP 545 (char_u *)NULL, PV_NONE,
546 (char_u *)&p_altkeymap, PV_NONE,
547 #else
548 (char_u *)NULL, PV_NONE,
549 #endif
550 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 546 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
551 {"ambiwidth", "ambw", P_STRING|P_VI_DEF|P_RCLR, 547 {"ambiwidth", "ambw", P_STRING|P_VI_DEF|P_RCLR,
552 (char_u *)&p_ambw, PV_NONE, 548 (char_u *)&p_ambw, PV_NONE,
553 {(char_u *)"single", (char_u *)0L} 549 {(char_u *)"single", (char_u *)0L}
554 SCTX_INIT}, 550 SCTX_INIT},
1139 SCTX_INIT}, 1135 SCTX_INIT},
1140 {"fixendofline", "fixeol", P_BOOL|P_VI_DEF|P_RSTAT, 1136 {"fixendofline", "fixeol", P_BOOL|P_VI_DEF|P_RSTAT,
1141 (char_u *)&p_fixeol, PV_FIXEOL, 1137 (char_u *)&p_fixeol, PV_FIXEOL,
1142 {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, 1138 {(char_u *)TRUE, (char_u *)0L} SCTX_INIT},
1143 {"fkmap", "fk", P_BOOL|P_VI_DEF, 1139 {"fkmap", "fk", P_BOOL|P_VI_DEF,
1144 #ifdef FEAT_FKMAP 1140 (char_u *)NULL, PV_NONE,
1145 (char_u *)&p_fkmap, PV_NONE,
1146 #else
1147 (char_u *)NULL, PV_NONE,
1148 #endif
1149 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 1141 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
1150 {"flash", "fl", P_BOOL|P_VI_DEF, 1142 {"flash", "fl", P_BOOL|P_VI_DEF,
1151 (char_u *)NULL, PV_NONE, 1143 (char_u *)NULL, PV_NONE,
1152 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 1144 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
1153 {"foldclose", "fcl", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN, 1145 {"foldclose", "fcl", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN,
8705 emsg(_(errmsg)); 8697 emsg(_(errmsg));
8706 } 8698 }
8707 } 8699 }
8708 #endif 8700 #endif
8709 8701
8710 #ifdef FEAT_FKMAP
8711 else if ((int *)varp == &p_altkeymap)
8712 {
8713 if (old_value != p_altkeymap)
8714 {
8715 if (!p_altkeymap)
8716 {
8717 p_hkmap = p_fkmap;
8718 p_fkmap = 0;
8719 }
8720 else
8721 {
8722 p_fkmap = p_hkmap;
8723 p_hkmap = 0;
8724 }
8725 (void)init_chartab();
8726 }
8727 }
8728
8729 /*
8730 * In case some second language keymapping options have changed, check
8731 * and correct the setting in a consistent way.
8732 */
8733
8734 /*
8735 * If hkmap or fkmap are set, reset Arabic keymapping.
8736 */
8737 if ((p_hkmap || p_fkmap) && p_altkeymap)
8738 {
8739 p_altkeymap = p_fkmap;
8740 # ifdef FEAT_ARABIC
8741 curwin->w_p_arab = FALSE;
8742 # endif
8743 (void)init_chartab();
8744 }
8745
8746 /*
8747 * If hkmap set, reset Farsi keymapping.
8748 */
8749 if (p_hkmap && p_altkeymap)
8750 {
8751 p_altkeymap = 0;
8752 p_fkmap = 0;
8753 # ifdef FEAT_ARABIC
8754 curwin->w_p_arab = FALSE;
8755 # endif
8756 (void)init_chartab();
8757 }
8758
8759 /*
8760 * If fkmap set, reset Hebrew keymapping.
8761 */
8762 if (p_fkmap && !p_altkeymap)
8763 {
8764 p_altkeymap = 1;
8765 p_hkmap = 0;
8766 # ifdef FEAT_ARABIC
8767 curwin->w_p_arab = FALSE;
8768 # endif
8769 (void)init_chartab();
8770 }
8771 #endif
8772
8773 #ifdef FEAT_ARABIC 8702 #ifdef FEAT_ARABIC
8774 if ((int *)varp == &curwin->w_p_arab) 8703 if ((int *)varp == &curwin->w_p_arab)
8775 { 8704 {
8776 if (curwin->w_p_arab) 8705 if (curwin->w_p_arab)
8777 { 8706 {
8813 8742
8814 # ifdef FEAT_KEYMAP 8743 # ifdef FEAT_KEYMAP
8815 /* Force-set the necessary keymap for arabic */ 8744 /* Force-set the necessary keymap for arabic */
8816 set_option_value((char_u *)"keymap", 0L, (char_u *)"arabic", 8745 set_option_value((char_u *)"keymap", 0L, (char_u *)"arabic",
8817 OPT_LOCAL); 8746 OPT_LOCAL);
8818 # endif
8819 # ifdef FEAT_FKMAP
8820 p_altkeymap = 0;
8821 p_hkmap = 0;
8822 p_fkmap = 0;
8823 (void)init_chartab();
8824 # endif 8747 # endif
8825 } 8748 }
8826 else 8749 else
8827 { 8750 {
8828 /* 8751 /*
11083 void 11006 void
11084 win_copy_options(win_T *wp_from, win_T *wp_to) 11007 win_copy_options(win_T *wp_from, win_T *wp_to)
11085 { 11008 {
11086 copy_winopt(&wp_from->w_onebuf_opt, &wp_to->w_onebuf_opt); 11009 copy_winopt(&wp_from->w_onebuf_opt, &wp_to->w_onebuf_opt);
11087 copy_winopt(&wp_from->w_allbuf_opt, &wp_to->w_allbuf_opt); 11010 copy_winopt(&wp_from->w_allbuf_opt, &wp_to->w_allbuf_opt);
11088 # ifdef FEAT_RIGHTLEFT
11089 # ifdef FEAT_FKMAP
11090 /* Is this right? */
11091 wp_to->w_farsi = wp_from->w_farsi;
11092 # endif
11093 # endif
11094 #if defined(FEAT_LINEBREAK) 11011 #if defined(FEAT_LINEBREAK)
11095 briopt_check(wp_to); 11012 briopt_check(wp_to);
11096 #endif 11013 #endif
11097 } 11014 }
11098 11015