Mercurial > vim

comparison src/structs.h @ 5735:50dbef5e774a v7.4.212

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 06e5f65c34d8
children e25a04c1c515
comparison
equal deleted inserted replaced
5734:657ade71d395 5735:50dbef5e774a
344 #ifdef FEAT_VIRTUALEDIT 344 #ifdef FEAT_VIRTUALEDIT
345 long uh_cursor_vcol; 345 long uh_cursor_vcol;
346 #endif 346 #endif
347 int uh_flags; /* see below */ 347 int uh_flags; /* see below */
348 pos_T uh_namedm[NMARKS]; /* marks before undo/after redo */ 348 pos_T uh_namedm[NMARKS]; /* marks before undo/after redo */
349 #ifdef FEAT_VISUAL
350 visualinfo_T uh_visual; /* Visual areas before undo/after redo */ 349 visualinfo_T uh_visual; /* Visual areas before undo/after redo */
351 #endif
352 time_t uh_time; /* timestamp when the change was made */ 350 time_t uh_time; /* timestamp when the change was made */
353 long uh_save_nr; /* set when the file was saved after the 351 long uh_save_nr; /* set when the file was saved after the
354 changes in this block */ 352 changes in this block */
355 #ifdef U_DEBUG 353 #ifdef U_DEBUG
356 int uh_magic; /* magic number to check allocation */ 354 int uh_magic; /* magic number to check allocation */
1404 off_t b_orig_size; /* size of original file in bytes */ 1402 off_t b_orig_size; /* size of original file in bytes */
1405 int b_orig_mode; /* mode of original file */ 1403 int b_orig_mode; /* mode of original file */
1406 1404
1407 pos_T b_namedm[NMARKS]; /* current named marks (mark.c) */ 1405 pos_T b_namedm[NMARKS]; /* current named marks (mark.c) */
1408 1406
1409 #ifdef FEAT_VISUAL
1410 /* These variables are set when VIsual_active becomes FALSE */ 1407 /* These variables are set when VIsual_active becomes FALSE */
1411 visualinfo_T b_visual; 1408 visualinfo_T b_visual;
1412 # ifdef FEAT_EVAL 1409 #ifdef FEAT_EVAL
1413 int b_visual_mode_eval; /* b_visual.vi_mode for visualmode() */ 1410 int b_visual_mode_eval; /* b_visual.vi_mode for visualmode() */
1414 # endif
1415 #endif 1411 #endif
1416 1412
1417 pos_T b_last_cursor; /* cursor position when last unloading this 1413 pos_T b_last_cursor; /* cursor position when last unloading this
1418 buffer */ 1414 buffer */
1419 pos_T b_last_insert; /* where Insert mode was left */ 1415 pos_T b_last_insert; /* where Insert mode was left */
1978 1974
1979 int w_set_curswant; /* If set, then update w_curswant the next 1975 int w_set_curswant; /* If set, then update w_curswant the next
1980 time through cursupdate() to the 1976 time through cursupdate() to the
1981 current virtual column */ 1977 current virtual column */
1982 1978
1983 #ifdef FEAT_VISUAL
1984 /* 1979 /*
1985 * the next six are used to update the visual part 1980 * the next six are used to update the visual part
1986 */ 1981 */
1987 char w_old_visual_mode; /* last known VIsual_mode */ 1982 char w_old_visual_mode; /* last known VIsual_mode */
1988 linenr_T w_old_cursor_lnum; /* last known end of visual part */ 1983 linenr_T w_old_cursor_lnum; /* last known end of visual part */
1989 colnr_T w_old_cursor_fcol; /* first column for block visual part */ 1984 colnr_T w_old_cursor_fcol; /* first column for block visual part */
1990 colnr_T w_old_cursor_lcol; /* last column for block visual part */ 1985 colnr_T w_old_cursor_lcol; /* last column for block visual part */
1991 linenr_T w_old_visual_lnum; /* last known start of visual part */ 1986 linenr_T w_old_visual_lnum; /* last known start of visual part */
1992 colnr_T w_old_visual_col; /* last known start of visual part */ 1987 colnr_T w_old_visual_col; /* last known start of visual part */
1993 colnr_T w_old_curswant; /* last known value of Curswant */ 1988 colnr_T w_old_curswant; /* last known value of Curswant */
1994 #endif
1995 1989
1996 /* 1990 /*
1997 * "w_topline", "w_leftcol" and "w_skipcol" specify the offsets for 1991 * "w_topline", "w_leftcol" and "w_skipcol" specify the offsets for
1998 * displaying the buffer. 1992 * displaying the buffer.
1999 */ 1993 */
2291 2285
2292 long line_count; /* number of lines from op_start to op_end 2286 long line_count; /* number of lines from op_start to op_end
2293 (inclusive) */ 2287 (inclusive) */
2294 int empty; /* op_start and op_end the same (only used by 2288 int empty; /* op_start and op_end the same (only used by
2295 do_change()) */ 2289 do_change()) */
2296 #ifdef FEAT_VISUAL
2297 int is_VIsual; /* operator on Visual area */ 2290 int is_VIsual; /* operator on Visual area */
2298 int block_mode; /* current operator is Visual block mode */ 2291 int block_mode; /* current operator is Visual block mode */
2299 #endif
2300 colnr_T start_vcol; /* start col for block mode operator */ 2292 colnr_T start_vcol; /* start col for block mode operator */
2301 colnr_T end_vcol; /* end col for block mode operator */ 2293 colnr_T end_vcol; /* end col for block mode operator */
2302 #ifdef FEAT_AUTOCMD 2294 #ifdef FEAT_AUTOCMD
2303 long prev_opcount; /* ca.opcount saved for K_CURSORHOLD */ 2295 long prev_opcount; /* ca.opcount saved for K_CURSORHOLD */
2304 long prev_count0; /* ca.count0 saved for K_CURSORHOLD */ 2296 long prev_count0; /* ca.count0 saved for K_CURSORHOLD */