Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated for version 7.0115

  • Loading branch information...
commit 78bef146ce4282a70bb345f2b0b8fa7bddd89573 1 parent 0bd2a15
vimboss authored
View
2  Filelist
@@ -30,6 +30,7 @@ SRC_ALL1 = \
src/gui.h \
src/gui_beval.c \
src/gui_beval.h \
+ src/hardcopy.c \
src/hashtable.c \
src/keymap.h \
src/macros.h \
@@ -94,6 +95,7 @@ SRC_ALL2 = \
src/proto/getchar.pro \
src/proto/gui.pro \
src/proto/gui_beval.pro \
+ src/proto/hardcopy.pro \
src/proto/hashtable.pro \
src/proto/main.pro \
src/proto/mark.pro \
View
16 src/globals.h
@@ -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 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 Exec_reg INIT(= FALSE); /* TRUE when executing a register */
+EXTERN int Recording INIT(= FALSE); /* TRUE when recording into a reg. */
+EXTERN int Exec_reg INIT(= FALSE); /* TRUE when executing a register */
-EXTERN int no_mapping INIT(= FALSE); /* currently no mapping 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 no_mapping INIT(= FALSE); /* currently no mapping allowed */
+EXTERN int no_zero_mapping INIT(= 0); /* mapping zero not allowed */
+EXTERN int allow_keys INIT(= FALSE); /* allow key codes when no_mapping
* 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 arrow_used; /* Normally FALSE, set to TRUE after
+EXTERN int restart_edit INIT(= 0); /* call edit when next cmd finished */
+EXTERN int arrow_used; /* Normally FALSE, set to TRUE after
* hitting cursor key in insert mode.
* Used by vgetorpeek() to decide when
* to call u_sync() */
View
3,650 src/hardcopy.c
3,650 additions, 0 deletions not shown
View
23 src/syntax.c
@@ -679,6 +679,7 @@ syn_sync(wp, start_lnum, last_valid)
linenr_T found_current_lnum = 0;
int found_current_col= 0;
lpos_T found_m_endpos;
+ colnr_T prev_current_col;
/*
* Clear any current state that might be hanging around.
@@ -849,10 +850,13 @@ syn_sync(wp, start_lnum, last_valid)
++current_col;
/* syn_current_attr() will have skipped the check for
- * an item that ends here, need to do that now. */
- ++current_col;
+ * an item that ends here, need to do that now. Be
+ * careful not to go past the NUL. */
+ prev_current_col = current_col;
+ if (syn_getcurline()[current_col] != NUL)
+ ++current_col;
check_state_ends();
- --current_col;
+ current_col = prev_current_col;
}
else
break;
@@ -1647,6 +1651,7 @@ syn_finish_line(syncing)
int syncing; /* called for syncing */
{
stateitem_T *cur_si;
+ colnr_T prev_current_col;
if (!current_finished)
{
@@ -1668,10 +1673,13 @@ syn_finish_line(syncing)
return TRUE;
/* syn_current_attr() will have skipped the check for an item
- * that ends here, need to do that now. */
- ++current_col;
+ * that ends here, need to do that now. Be careful not to go
+ * past the NUL. */
+ prev_current_col = current_col;
+ if (syn_getcurline()[current_col] != NUL)
+ ++current_col;
check_state_ends();
- --current_col;
+ current_col = prev_current_col;
}
++current_col;
}
@@ -2252,7 +2260,8 @@ syn_current_attr(syncing, displaying, can_spell)
if (!syncing)
{
check_state_ends();
- if (current_state.ga_len > 0)
+ if (current_state.ga_len > 0
+ && syn_getcurline()[current_col] != NUL)
{
++current_col;
check_state_ends();
View
4 src/version.h
@@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 23)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 23, compiled "
+#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 24, compiled "
Please sign in to comment.
Something went wrong with that request. Please try again.