comparison src/ex_cmds2.c @ 205:d292c40ca788

updated for version 7.0060
author vimboss
date Tue, 15 Mar 2005 22:43:58 +0000
parents 84c21eb4fc40
children 73354c21f1e4
comparison
equal deleted inserted replaced
204:a7547c77e563 205:d292c40ca788
3123 else 3123 else
3124 { 3124 {
3125 line = sp->nextline; 3125 line = sp->nextline;
3126 sp->nextline = NULL; 3126 sp->nextline = NULL;
3127 ++sourcing_lnum; 3127 ++sourcing_lnum;
3128 }
3128 #ifdef FEAT_PROFILE 3129 #ifdef FEAT_PROFILE
3129 if (do_profiling) 3130 if (line != NULL && do_profiling)
3130 script_line_start(); 3131 script_line_start();
3131 #endif 3132 #endif
3132 }
3133 3133
3134 /* Only concatenate lines starting with a \ when 'cpoptions' doesn't 3134 /* Only concatenate lines starting with a \ when 'cpoptions' doesn't
3135 * contain the 'C' flag. */ 3135 * contain the 'C' flag. */
3136 if (line != NULL && (vim_strchr(p_cpo, CPO_CONCAT) == NULL)) 3136 if (line != NULL && (vim_strchr(p_cpo, CPO_CONCAT) == NULL))
3137 { 3137 {
3682 } 3682 }
3683 3683
3684 static void 3684 static void
3685 prt_get_attr(hl_id, pattr, modec) 3685 prt_get_attr(hl_id, pattr, modec)
3686 int hl_id; 3686 int hl_id;
3687 prt_text_attr_T* pattr; 3687 prt_text_attr_T *pattr;
3688 int modec; 3688 int modec;
3689 { 3689 {
3690 int colorindex; 3690 int colorindex;
3691 long_u fg_color; 3691 long_u fg_color;
3692 long_u bg_color; 3692 long_u bg_color;
3693 char *color; 3693 char *color;
3694 3694
3695 pattr->bold = (highlight_has_attr(hl_id, HL_BOLD, modec) != NULL); 3695 pattr->bold = (highlight_has_attr(hl_id, HL_BOLD, modec) != NULL);
3696 pattr->italic = (highlight_has_attr(hl_id, HL_ITALIC, modec) != NULL); 3696 pattr->italic = (highlight_has_attr(hl_id, HL_ITALIC, modec) != NULL);
3697 pattr->underline = (highlight_has_attr(hl_id, HL_UNDERLINE, modec) != NULL); 3697 pattr->underline = (highlight_has_attr(hl_id, HL_UNDERLINE, modec) != NULL);
3698 pattr->undercurl = (highlight_has_attr(hl_id, HL_UNDERCURL, modec) != NULL);
3698 3699
3699 # ifdef FEAT_GUI 3700 # ifdef FEAT_GUI
3700 if (gui.in_use) 3701 if (gui.in_use)
3701 { 3702 {
3702 bg_color = highlight_gui_color_rgb(hl_id, FALSE); 3703 bg_color = highlight_gui_color_rgb(hl_id, FALSE);