vim: src/screen.c comparison

comparison src/screen.c @ 5735:50dbef5e774a v7.4.212

updated for version 7.4.212 Problem: Now that the +visual feature is always enabled the #ifdefs for it are not useful. Solution: Remove the checks for FEAT_VISUAL.

author	Bram Moolenaar <bram@vim.org>
date	Sun, 23 Mar 2014 15:13:05 +0100
parents	62c720661f81
children	662ae48e7e24

comparison

equal deleted inserted replaced

-:657ade71d395
+:50dbef5e774a
 	    curwin->w_lines[i].wl_valid = FALSE;
 }
 #endif
 }
-#if defined(FEAT_RUBY) || defined(FEAT_PERL) || defined(FEAT_VISUAL) || \
-(defined(FEAT_CLIPBOARD) && defined(FEAT_X11)) || defined(PROTO)
 /*
 * update all windows that are editing the current buffer
 */
 void
 update_curbuf(type)
 int		type;
 {
 redraw_curbuf_later(type);
 update_screen(type);
 }
-#endif
 /*
 * update_screen()
 *
 * Based on the current value of curwin->w_topline, transfer a screenfull
 #ifdef FEAT_DIFF
 		    && curwin->w_topfill == curwin->w_old_topfill
 		    && curwin->w_botfill == curwin->w_old_botfill
 #endif
 		    && curwin->w_topline == curwin->w_lines[0].wl_lnum)
-#ifdef FEAT_VISUAL
 		|| (type == INVERTED
 		    && VIsual_active
 		    && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum
 		    && curwin->w_old_visual_mode == VIsual_mode
 		    && (curwin->w_valid & VALID_VIRTCOL)
 		    && curwin->w_old_curswant == curwin->w_curswant)
-#endif
 		))
 	curwin->w_redr_type = type;
 #ifdef FEAT_WINDOWS
 /* Redraw the tab pages line if needed. */
 				   updating.  999 when no mid area updating. */
 int		mid_end = 0;	/* Below last row of the mid area that needs
 				   updating.  0 when no mid area updating. */
 int		bot_start = 999;/* first row of the bot area that needs
 				   updating.  999 when no bot area updating */
-#ifdef FEAT_VISUAL
 int		scrolled_down = FALSE;	/* TRUE when scrolled down when
 					   w_topline got smaller a bit */
-#endif
 #ifdef FEAT_SEARCH_EXTRA
 matchitem_T *cur;		/* points to the match list */
 int		top_to_mod = FALSE;    /* redraw above mod_top */
 #endif
 			if (wp->w_lines_valid != 0)
 			{
 			    /* Need to update rows that are new, stop at the
 			     * first one that scrolled down. */
 			    top_end = i;
-#ifdef FEAT_VISUAL
 			    scrolled_down = TRUE;
-#endif
 			    /* Move the entries that were scrolled, disable
 			     * the entries for the lines to be redrawn. */
 			    if ((wp->w_lines_valid += j) > wp->w_height)
 				wp->w_lines_valid = wp->w_height;
 	mid_start = 0;
 	mid_end = wp->w_height;
 	type = NOT_VALID;
 }
-#ifdef FEAT_VISUAL
 /* check if we are updating or removing the inverted part */
 if ((VIsual_active && buf == curwin->w_buffer)
 	    || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID))
 {
 	linenr_T    from, to;
 	wp->w_old_visual_mode = 0;
 	wp->w_old_cursor_lnum = 0;
 	wp->w_old_visual_lnum = 0;
 	wp->w_old_visual_col = 0;
 }
-#endif /* FEAT_VISUAL */
 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA)
 /* reset got_int, otherwise regexp won't work */
 save_got_int = got_int;
 got_int = 0;
 /*
 * 6. set highlighting for the Visual area an other text.
 * If all folded lines are in the Visual area, highlight the line.
 */
-#ifdef FEAT_VISUAL
 if (VIsual_active && wp->w_buffer == curwin->w_buffer)
 {
 	if (ltoreq(curwin->w_cursor, VIsual))
 	{
 	    /* Visual is after curwin->w_cursor */
 		/* Set all attributes of the text */
 		RL_MEMSET(txtcol, hl_attr(HLF_V), W_WIDTH(wp) - txtcol);
 	    }
 	}
 }
-#endif
 #ifdef FEAT_SYN_HL
 /* Show 'cursorcolumn' in the fold line. */
 if (wp->w_p_cuc)
 {
 int		n_skip = 0;		/* nr of chars to skip for 'nowrap' */
 int		fromcol, tocol;		/* start/end of inverting */
 int		fromcol_prev = -2;	/* start of inverting after cursor */
 int		noinvcur = FALSE;	/* don't invert the cursor */
-#ifdef FEAT_VISUAL
 pos_T	*top, *bot;
 int		lnum_in_visual_area = FALSE;
-#endif
 pos_T	pos;
 long	v;
 int		char_attr = 0;		/* attributes for next character */
 int		attr_pri = FALSE;	/* char_attr has priority */
 /*
 * handle visual active in this window
 */
 fromcol = -10;
 tocol = MAXCOL;
-#ifdef FEAT_VISUAL
 if (VIsual_active && wp->w_buffer == curwin->w_buffer)
 {
 					/* Visual is after curwin->w_cursor */
 	if (ltoreq(curwin->w_cursor, VIsual))
 	{
 }
 /*
 * handle 'incsearch' and ":s///c" highlighting
 */
-else
+else if (highlight_match
-#endif /* FEAT_VISUAL */
-	if (highlight_match
 	    && wp == curwin
 	    && lnum >= curwin->w_cursor.lnum
 	    && lnum <= curwin->w_cursor.lnum + search_match_lines)
 {
 	if (lnum == curwin->w_cursor.lnum)
 	    prev_ptr = ptr;
 #endif
 	    mb_ptr_adv(ptr);
 	}
-#if defined(FEAT_SYN_HL) || defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
 	/* When:
 	 * - 'cuc' is set, or
 	 * - 'colorcolumn' is set, or
 	 * - 'virtualedit' is set, or
 	 * - the visual mode is active,
 	 * the end of the line may be before the start of the displayed part.
 	 */
 	if (vcol < v && (
-# ifdef FEAT_SYN_HL
+#ifdef FEAT_SYN_HL
-	     wp->w_p_cuc
+	     wp->w_p_cuc || draw_color_col ||
-	     || draw_color_col
+#endif
-#  if defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
+#ifdef FEAT_VIRTUALEDIT
-	     ||
+	     virtual_active() ||
-#  endif
+#endif
-# endif
+	     (VIsual_active && wp->w_buffer == curwin->w_buffer)))
-# ifdef FEAT_VIRTUALEDIT
-	     virtual_active()
-#  ifdef FEAT_VISUAL
-	     ||
-#  endif
-# endif
-# ifdef FEAT_VISUAL
-	     (VIsual_active && wp->w_buffer == curwin->w_buffer)
-# endif
-	     ))
 	{
 	    vcol = v;
 	}
-#endif
 	/* Handle a character that's not completely on the screen: Put ptr at
 	 * that character but skip the first few screen characters. */
 	if (vcol > v)
 	{
 		}
 		else if (c == NUL
 			&& ((wp->w_p_list && lcs_eol > 0)
 			    || ((fromcol >= 0 || fromcol_prev >= 0)
 				&& tocol > vcol
-#ifdef FEAT_VISUAL
 				&& VIsual_mode != Ctrl_V
-#endif
 				&& (
 # ifdef FEAT_RIGHTLEFT
 				    wp->w_p_rl ? (col >= 0) :
 # endif
 				    (col < W_WIDTH(wp)))
 		}
 	    }
 #endif
 	    if (lcs_eol == lcs_eol_one
 		    && ((area_attr != 0 && vcol == fromcol
-#ifdef FEAT_VISUAL
 			    && (VIsual_mode != Ctrl_V
 				|| lnum == VIsual.lnum
 				|| lnum == curwin->w_cursor.lnum)
-#endif
 			    && c == NUL)
 #ifdef FEAT_SEARCH_EXTRA
 			/* highlight 'hlsearch' match at end of line */
 			|| (prevcol_hl_flag == TRUE
 # if defined(LINE_ATTR)
 #endif
 do_mode = ((p_smd && msg_silent == 0)
 	    && ((State & INSERT)
 		|| restart_edit
-#ifdef FEAT_VISUAL
+		|| VIsual_active));
-		|| VIsual_active
-#endif
-		));
 if (do_mode || Recording)
 {
 	/*
 	 * Don't show mode right now, when not redrawing or inside a mapping.
 	 * Call char_avail() only when we are going to show something, because
 		}
 #endif
 		if ((State & INSERT) && p_paste)
 		    MSG_PUTS_ATTR(_(" (paste)"), attr);
-#ifdef FEAT_VISUAL
 		if (VIsual_active)
 		{
 		    char *p;
 		    /* Don't concatenate separate words to avoid translation
 			case 5: p = N_(" SELECT LINE"); break;
 			default: p = N_(" SELECT BLOCK"); break;
 		    }
 		    MSG_PUTS_ATTR(_(p), attr);
 		}
-#endif
 		MSG_PUTS_ATTR(" --", attr);
 	    }
 	    need_clear = TRUE;
 	}
 else if (clear_cmdline && msg_silent == 0)
 	/* Clear the whole command line.  Will reset "clear_cmdline". */
 	msg_clr_cmdline();
 #ifdef FEAT_CMDL_INFO
-# ifdef FEAT_VISUAL
 /* In Visual mode the size of the selected area must be redrawn. */
 if (VIsual_active)
 	clear_showcmd();
-# endif
 /* If the last window has no status line, the ruler is after the mode
 * message and must be redrawn */
 if (redrawing()
 # ifdef FEAT_WINDOWS

Mercurial > vim

comparison src/screen.c @ 5735:50dbef5e774a v7.4.212