Mercurial > vim
comparison src/screen.c @ 42:c75153d791d0
updated for version 7.0026
author | vimboss |
---|---|
date | Wed, 29 Dec 2004 20:58:21 +0000 |
parents | f1d2a58883b9 |
children | 6b9e8f951af4 |
comparison
equal
deleted
inserted
replaced
41:f529edb9bab3 | 42:c75153d791d0 |
---|---|
3778 && draw_state == WL_LINE | 3778 && draw_state == WL_LINE |
3779 && (area_attr == 0 || char_attr != area_attr) | 3779 && (area_attr == 0 || char_attr != area_attr) |
3780 && (search_attr == 0 || char_attr != search_attr)) | 3780 && (search_attr == 0 || char_attr != search_attr)) |
3781 char_attr = extra_attr; | 3781 char_attr = extra_attr; |
3782 | 3782 |
3783 #if defined(FEAT_XIM) && (defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE)) | 3783 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
3784 /* XIM don't send preedit_start and preedit_end, but they send | 3784 /* XIM don't send preedit_start and preedit_end, but they send |
3785 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | 3785 * preedit_changed and commit. Thus Vim can't set "im_is_active", use |
3786 * im_is_preediting() here. */ | 3786 * im_is_preediting() here. */ |
3787 if (xic != NULL | 3787 if (xic != NULL |
3788 && lnum == curwin->w_cursor.lnum | 3788 && lnum == curwin->w_cursor.lnum |
4769 #ifdef FEAT_MENU | 4769 #ifdef FEAT_MENU |
4770 || (emenu && (s[0] == '\\' && s[1] != NUL)) | 4770 || (emenu && (s[0] == '\\' && s[1] != NUL)) |
4771 #endif | 4771 #endif |
4772 ) | 4772 ) |
4773 ++s; | 4773 ++s; |
4774 len += ptr2cells(s++); | 4774 len += ptr2cells(s); |
4775 mb_ptr_adv(s); | 4775 mb_ptr_adv(s); |
4776 } | 4776 } |
4777 | 4777 |
4778 return len; | 4778 return len; |
4779 } | 4779 } |