Mercurial > vim
comparison src/option.c @ 1945:9d6a886aceb2 v7.2.242
updated for version 7.2-242
author | vimboss |
---|---|
date | Wed, 29 Jul 2009 13:42:05 +0000 |
parents | d92358c7d621 |
children | c51a4f993675 |
comparison
equal
deleted
inserted
replaced
1944:40a8e388692b | 1945:9d6a886aceb2 |
---|---|
7192 if ((int *)varp == &p_cp) | 7192 if ((int *)varp == &p_cp) |
7193 { | 7193 { |
7194 compatible_set(); | 7194 compatible_set(); |
7195 } | 7195 } |
7196 | 7196 |
7197 /* 'list', 'number' */ | |
7198 else if ((int *)varp == &curwin->w_p_list | |
7199 || (int *)varp == &curwin->w_p_nu) | |
7200 { | |
7201 if (curwin->w_curswant != MAXCOL) | |
7202 curwin->w_set_curswant = TRUE; | |
7203 } | |
7204 | |
7197 else if ((int *)varp == &curbuf->b_p_ro) | 7205 else if ((int *)varp == &curbuf->b_p_ro) |
7198 { | 7206 { |
7199 /* when 'readonly' is reset globally, also reset readonlymode */ | 7207 /* when 'readonly' is reset globally, also reset readonlymode */ |
7200 if (!curbuf->b_p_ro && (opt_flags & OPT_LOCAL) == 0) | 7208 if (!curbuf->b_p_ro && (opt_flags & OPT_LOCAL) == 0) |
7201 readonlymode = FALSE; | 7209 readonlymode = FALSE; |
7643 /* Revert to the default keymap */ | 7651 /* Revert to the default keymap */ |
7644 curbuf->b_p_iminsert = B_IMODE_NONE; | 7652 curbuf->b_p_iminsert = B_IMODE_NONE; |
7645 curbuf->b_p_imsearch = B_IMODE_USE_INSERT; | 7653 curbuf->b_p_imsearch = B_IMODE_USE_INSERT; |
7646 # endif | 7654 # endif |
7647 } | 7655 } |
7656 if (curwin->w_curswant != MAXCOL) | |
7657 curwin->w_set_curswant = TRUE; | |
7658 } | |
7659 | |
7660 else if ((int *)varp == &p_arshape) | |
7661 { | |
7662 if (curwin->w_curswant != MAXCOL) | |
7663 curwin->w_set_curswant = TRUE; | |
7648 } | 7664 } |
7649 #endif | 7665 #endif |
7650 | 7666 |
7651 /* | 7667 /* |
7652 * End of handling side effects for bool options. | 7668 * End of handling side effects for bool options. |
7653 */ | 7669 */ |
7654 | 7670 |
7655 options[opt_idx].flags |= P_WAS_SET; | 7671 options[opt_idx].flags |= P_WAS_SET; |
7656 | 7672 |
7657 comp_col(); /* in case 'ruler' or 'showcmd' changed */ | 7673 comp_col(); /* in case 'ruler' or 'showcmd' changed */ |
7658 if (curwin->w_curswant != MAXCOL) | 7674 |
7659 curwin->w_set_curswant = TRUE; /* in case 'list' changed */ | |
7660 check_redraw(options[opt_idx].flags); | 7675 check_redraw(options[opt_idx].flags); |
7661 | 7676 |
7662 return NULL; | 7677 return NULL; |
7663 } | 7678 } |
7664 | 7679 |