Mercurial > vim
changeset 1148:e1dc2698121c
updated for version 7.1a
author | vimboss |
---|---|
date | Sun, 06 May 2007 13:04:32 +0000 |
parents | ce98cc04efe2 |
children | 3507156c34bb |
files | src/proto/getchar.pro src/regexp.c |
diffstat | 2 files changed, 65 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/src/proto/getchar.pro +++ b/src/proto/getchar.pro @@ -1,66 +1,66 @@ /* getchar.c */ -extern void free_buff __ARGS((struct buffheader *buf)); -extern char_u *get_recorded __ARGS((void)); -extern char_u *get_inserted __ARGS((void)); -extern int stuff_empty __ARGS((void)); -extern void typeahead_noflush __ARGS((int c)); -extern void flush_buffers __ARGS((int typeahead)); -extern void ResetRedobuff __ARGS((void)); -extern void saveRedobuff __ARGS((void)); -extern void restoreRedobuff __ARGS((void)); -extern void AppendToRedobuff __ARGS((char_u *s)); -extern void AppendToRedobuffLit __ARGS((char_u *str, int len)); -extern void AppendCharToRedobuff __ARGS((int c)); -extern void AppendNumberToRedobuff __ARGS((long n)); -extern void stuffReadbuff __ARGS((char_u *s)); -extern void stuffReadbuffLen __ARGS((char_u *s, long len)); -extern void stuffReadbuffSpec __ARGS((char_u *s)); -extern void stuffcharReadbuff __ARGS((int c)); -extern void stuffnumReadbuff __ARGS((long n)); -extern int start_redo __ARGS((long count, int old_redo)); -extern int start_redo_ins __ARGS((void)); -extern void stop_redo_ins __ARGS((void)); -extern int ins_typebuf __ARGS((char_u *str, int noremap, int offset, int nottyped, int silent)); -extern void ins_char_typebuf __ARGS((int c)); -extern int typebuf_changed __ARGS((int tb_change_cnt)); -extern int typebuf_typed __ARGS((void)); -extern int typebuf_maplen __ARGS((void)); -extern void del_typebuf __ARGS((int len, int offset)); -extern int alloc_typebuf __ARGS((void)); -extern void free_typebuf __ARGS((void)); -extern int save_typebuf __ARGS((void)); -extern void save_typeahead __ARGS((tasave_T *tp)); -extern void restore_typeahead __ARGS((tasave_T *tp)); -extern void openscript __ARGS((char_u *name, int directly)); -extern void close_all_scripts __ARGS((void)); -extern int using_script __ARGS((void)); -extern void before_blocking __ARGS((void)); -extern void updatescript __ARGS((int c)); -extern int vgetc __ARGS((void)); -extern int safe_vgetc __ARGS((void)); -extern int vpeekc __ARGS((void)); -extern int vpeekc_nomap __ARGS((void)); -extern int vpeekc_any __ARGS((void)); -extern int char_avail __ARGS((void)); -extern void vungetc __ARGS((int c)); -extern int inchar __ARGS((char_u *buf, int maxlen, long wait_time, int tb_change_cnt)); -extern int fix_input_buffer __ARGS((char_u *buf, int len, int script)); -extern int input_available __ARGS((void)); -extern int do_map __ARGS((int maptype, char_u *arg, int mode, int abbrev)); -extern int get_map_mode __ARGS((char_u **cmdp, int forceit)); -extern void map_clear __ARGS((char_u *cmdp, char_u *arg, int forceit, int abbr)); -extern void map_clear_int __ARGS((buf_T *buf, int mode, int local, int abbr)); -extern int map_to_exists __ARGS((char_u *str, char_u *modechars, int abbr)); -extern int map_to_exists_mode __ARGS((char_u *rhs, int mode, int abbr)); -extern char_u *set_context_in_map_cmd __ARGS((expand_T *xp, char_u *cmd, char_u *arg, int forceit, int isabbrev, int isunmap, cmdidx_T cmdidx)); -extern int ExpandMappings __ARGS((regmatch_T *regmatch, int *num_file, char_u ***file)); -extern int check_abbr __ARGS((int c, char_u *ptr, int col, int mincol)); -extern char_u *vim_strsave_escape_csi __ARGS((char_u *p)); -extern void vim_unescape_csi __ARGS((char_u *p)); -extern int makemap __ARGS((FILE *fd, buf_T *buf)); -extern int put_escstr __ARGS((FILE *fd, char_u *strstart, int what)); -extern void check_map_keycodes __ARGS((void)); -extern char_u *check_map __ARGS((char_u *keys, int mode, int exact, int ign_mod, int abbr)); -extern void init_mappings __ARGS((void)); -extern void add_map __ARGS((char_u *map, int mode)); +void free_buff __ARGS((struct buffheader *buf)); +char_u *get_recorded __ARGS((void)); +char_u *get_inserted __ARGS((void)); +int stuff_empty __ARGS((void)); +void typeahead_noflush __ARGS((int c)); +void flush_buffers __ARGS((int typeahead)); +void ResetRedobuff __ARGS((void)); +void saveRedobuff __ARGS((void)); +void restoreRedobuff __ARGS((void)); +void AppendToRedobuff __ARGS((char_u *s)); +void AppendToRedobuffLit __ARGS((char_u *str, int len)); +void AppendCharToRedobuff __ARGS((int c)); +void AppendNumberToRedobuff __ARGS((long n)); +void stuffReadbuff __ARGS((char_u *s)); +void stuffReadbuffLen __ARGS((char_u *s, long len)); +void stuffReadbuffSpec __ARGS((char_u *s)); +void stuffcharReadbuff __ARGS((int c)); +void stuffnumReadbuff __ARGS((long n)); +int start_redo __ARGS((long count, int old_redo)); +int start_redo_ins __ARGS((void)); +void stop_redo_ins __ARGS((void)); +int ins_typebuf __ARGS((char_u *str, int noremap, int offset, int nottyped, int silent)); +void ins_char_typebuf __ARGS((int c)); +int typebuf_changed __ARGS((int tb_change_cnt)); +int typebuf_typed __ARGS((void)); +int typebuf_maplen __ARGS((void)); +void del_typebuf __ARGS((int len, int offset)); +int alloc_typebuf __ARGS((void)); +void free_typebuf __ARGS((void)); +int save_typebuf __ARGS((void)); +void save_typeahead __ARGS((tasave_T *tp)); +void restore_typeahead __ARGS((tasave_T *tp)); +void openscript __ARGS((char_u *name, int directly)); +void close_all_scripts __ARGS((void)); +int using_script __ARGS((void)); +void before_blocking __ARGS((void)); +void updatescript __ARGS((int c)); +int vgetc __ARGS((void)); +int safe_vgetc __ARGS((void)); +int vpeekc __ARGS((void)); +int vpeekc_nomap __ARGS((void)); +int vpeekc_any __ARGS((void)); +int char_avail __ARGS((void)); +void vungetc __ARGS((int c)); +int inchar __ARGS((char_u *buf, int maxlen, long wait_time, int tb_change_cnt)); +int fix_input_buffer __ARGS((char_u *buf, int len, int script)); +int input_available __ARGS((void)); +int do_map __ARGS((int maptype, char_u *arg, int mode, int abbrev)); +int get_map_mode __ARGS((char_u **cmdp, int forceit)); +void map_clear __ARGS((char_u *cmdp, char_u *arg, int forceit, int abbr)); +void map_clear_int __ARGS((buf_T *buf, int mode, int local, int abbr)); +int map_to_exists __ARGS((char_u *str, char_u *modechars, int abbr)); +int map_to_exists_mode __ARGS((char_u *rhs, int mode, int abbr)); +char_u *set_context_in_map_cmd __ARGS((expand_T *xp, char_u *cmd, char_u *arg, int forceit, int isabbrev, int isunmap, cmdidx_T cmdidx)); +int ExpandMappings __ARGS((regmatch_T *regmatch, int *num_file, char_u ***file)); +int check_abbr __ARGS((int c, char_u *ptr, int col, int mincol)); +char_u *vim_strsave_escape_csi __ARGS((char_u *p)); +void vim_unescape_csi __ARGS((char_u *p)); +int makemap __ARGS((FILE *fd, buf_T *buf)); +int put_escstr __ARGS((FILE *fd, char_u *strstart, int what)); +void check_map_keycodes __ARGS((void)); +char_u *check_map __ARGS((char_u *keys, int mode, int exact, int ign_mod, int abbr)); +void init_mappings __ARGS((void)); +void add_map __ARGS((char_u *map, int mode)); /* vim: set ft=c : */
--- a/src/regexp.c +++ b/src/regexp.c @@ -3840,7 +3840,7 @@ regmatch(scan) pos_T *pos; pos = getmark(mark, FALSE); - if (pos == NULL /* mark doesn't exist) */ + if (pos == NULL /* mark doesn't exist */ || pos->lnum <= 0 /* mark isn't set (in curbuf) */ || (pos->lnum == reglnum + reg_firstlnum ? (pos->col == (colnr_T)(reginput - regline)