thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.0115

Browse Source
This commit is contained in:
Bram Moolenaar
2005-07-24 21:16:51 +00:00
parent 65de869c4f
commit 81366db6d6
5 changed files with 3678 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Filelist
View File

@@ -30,6 +30,7 @@ SRC_ALL1 = \
src/gui.h \ src/gui.h \
src/gui_beval.c \ src/gui_beval.c \
src/gui_beval.h \ src/gui_beval.h \
src/hardcopy.c \
src/hashtable.c \ src/hashtable.c \
src/keymap.h \ src/keymap.h \
src/macros.h \ src/macros.h \
@@ -94,6 +95,7 @@ SRC_ALL2 = \
src/proto/getchar.pro \ src/proto/getchar.pro \
src/proto/gui.pro \ src/proto/gui.pro \
src/proto/gui_beval.pro \ src/proto/gui_beval.pro \
src/proto/hardcopy.pro \
src/proto/hashtable.pro \ src/proto/hashtable.pro \
src/proto/main.pro \ src/proto/main.pro \
src/proto/mark.pro \ src/proto/mark.pro \

16
src/globals.h
View File

@@ -790,17 +790,17 @@ EXTERN int finish_op INIT(= FALSE);/* TRUE while an operator is pending */
EXTERN int exmode_active INIT(= 0); /* zero, EXMODE_NORMAL or EXMODE_VIM */ EXTERN int exmode_active INIT(= 0); /* zero, EXMODE_NORMAL or EXMODE_VIM */
EXTERN int ex_no_reprint INIT(= FALSE); /* no need to print after z or p */ EXTERN int ex_no_reprint INIT(= FALSE); /* no need to print after z or p */
EXTERN int Recording INIT(= FALSE);/* TRUE when recording into a reg. */ EXTERN int Recording INIT(= FALSE); /* TRUE when recording into a reg. */
EXTERN int Exec_reg INIT(= FALSE); /* TRUE when executing a register */ EXTERN int Exec_reg INIT(= FALSE); /* TRUE when executing a register */
EXTERN int no_mapping INIT(= FALSE); /* currently no mapping allowed */ EXTERN int no_mapping INIT(= FALSE); /* currently no mapping allowed */
EXTERN int no_zero_mapping INIT(= 0); /* mapping zero not allowed */ EXTERN int no_zero_mapping INIT(= 0); /* mapping zero not allowed */
EXTERN int allow_keys INIT(= FALSE); /* allow key codes when no_mapping EXTERN int allow_keys INIT(= FALSE); /* allow key codes when no_mapping
* is set */ * is set */
EXTERN int no_u_sync INIT(= 0); /* Don't call u_sync() */ EXTERN int no_u_sync INIT(= 0); /* Don't call u_sync() */
EXTERN int restart_edit INIT(= 0); /* call edit when next cmd finished */ EXTERN int restart_edit INIT(= 0); /* call edit when next cmd finished */
EXTERN int arrow_used; /* Normally FALSE, set to TRUE after EXTERN int arrow_used; /* Normally FALSE, set to TRUE after
* hitting cursor key in insert mode. * hitting cursor key in insert mode.
* Used by vgetorpeek() to decide when * Used by vgetorpeek() to decide when
* to call u_sync() */ * to call u_sync() */

3650
src/hardcopy.c Normal file
View File

File diff suppressed because it is too large Load Diff

23
src/syntax.c
View File

@@ -679,6 +679,7 @@ syn_sync(wp, start_lnum, last_valid)
linenr_T found_current_lnum = 0; linenr_T found_current_lnum = 0;
int found_current_col= 0; int found_current_col= 0;
lpos_T found_m_endpos; lpos_T found_m_endpos;
colnr_T prev_current_col;
/* /*
* Clear any current state that might be hanging around. * Clear any current state that might be hanging around.
@@ -849,10 +850,13 @@ syn_sync(wp, start_lnum, last_valid)
++current_col; ++current_col;
/* syn_current_attr() will have skipped the check for /* syn_current_attr() will have skipped the check for
* an item that ends here, need to do that now. */ * an item that ends here, need to do that now. Be
++current_col; * careful not to go past the NUL. */
prev_current_col = current_col;
if (syn_getcurline()[current_col] != NUL)
++current_col;
check_state_ends(); check_state_ends();
--current_col; current_col = prev_current_col;
} }
else else
break; break;
@@ -1647,6 +1651,7 @@ syn_finish_line(syncing)
int syncing; /* called for syncing */ int syncing; /* called for syncing */
{ {
stateitem_T *cur_si; stateitem_T *cur_si;
colnr_T prev_current_col;
if (!current_finished) if (!current_finished)
{ {
@@ -1668,10 +1673,13 @@ syn_finish_line(syncing)
return TRUE; return TRUE;
/* syn_current_attr() will have skipped the check for an item /* syn_current_attr() will have skipped the check for an item
* that ends here, need to do that now. */ * that ends here, need to do that now. Be careful not to go
++current_col; * past the NUL. */
prev_current_col = current_col;
if (syn_getcurline()[current_col] != NUL)
++current_col;
check_state_ends(); check_state_ends();
--current_col; current_col = prev_current_col;
} }
++current_col; ++current_col;
} }
@@ -2252,7 +2260,8 @@ syn_current_attr(syncing, displaying, can_spell)
if (!syncing) if (!syncing)
{ {
check_state_ends(); check_state_ends();
if (current_state.ga_len > 0) if (current_state.ga_len > 0
&& syn_getcurline()[current_col] != NUL)
{ {
++current_col; ++current_col;
check_state_ends(); check_state_ends();

4
src/version.h
View File

@@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA" #define VIM_VERSION_MEDIUM "7.0aa ALPHA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 23)" #define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 24)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 23, compiled " #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 24, compiled "