diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/globals.h | 9 | ||||
-rw-r--r-- | src/proto/memline.pro | 60 | ||||
-rw-r--r-- | src/version.h | 4 |
3 files changed, 38 insertions, 35 deletions
diff --git a/src/globals.h b/src/globals.h index b589131a8d..ede48c6dd4 100644 --- a/src/globals.h +++ b/src/globals.h @@ -841,9 +841,12 @@ EXTERN int msg_silent INIT(= 0); /* don't print messages */ EXTERN int emsg_silent INIT(= 0); /* don't print error messages */ EXTERN int cmd_silent INIT(= FALSE); /* don't echo the command line */ -#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) -EXTERN int swap_exists_action INIT(= 0); /* use dialog when swap file - already exists */ +#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) \ + || defined(FEAT_AUTOCMD) +# define HAS_SWAP_EXISTS_ACTION +EXTERN int swap_exists_action INIT(= SEA_NONE); + /* For dialog when swap file already + * exists. */ #endif EXTERN char_u *IObuff; /* sprintf's are done in this buffer, diff --git a/src/proto/memline.pro b/src/proto/memline.pro index 4f75853b38..90d3285595 100644 --- a/src/proto/memline.pro +++ b/src/proto/memline.pro @@ -1,32 +1,32 @@ /* memline.c */ -int ml_open __ARGS((void)); -void ml_setname __ARGS((buf_T *buf)); -void ml_open_files __ARGS((void)); -void ml_open_file __ARGS((buf_T *buf)); -void check_need_swap __ARGS((int newfile)); -void ml_close __ARGS((buf_T *buf, int del_file)); -void ml_close_all __ARGS((int del_file)); -void ml_close_notmod __ARGS((void)); -void ml_timestamp __ARGS((buf_T *buf)); -void ml_recover __ARGS((void)); -int recover_names __ARGS((char_u **fname, int list, int nr)); -void ml_sync_all __ARGS((int check_file, int check_char)); -void ml_preserve __ARGS((buf_T *buf, int message)); -char_u *ml_get __ARGS((linenr_T lnum)); -char_u *ml_get_pos __ARGS((pos_T *pos)); -char_u *ml_get_curline __ARGS((void)); -char_u *ml_get_cursor __ARGS((void)); -char_u *ml_get_buf __ARGS((buf_T *buf, linenr_T lnum, int will_change)); -int ml_line_alloced __ARGS((void)); -int ml_append __ARGS((linenr_T lnum, char_u *line, colnr_T len, int newfile)); -int ml_replace __ARGS((linenr_T lnum, char_u *line, int copy)); -int ml_delete __ARGS((linenr_T lnum, int message)); -void ml_setmarked __ARGS((linenr_T lnum)); -linenr_T ml_firstmarked __ARGS((void)); -void ml_clearmarked __ARGS((void)); -char_u *makeswapname __ARGS((char_u *fname, char_u *ffname, buf_T *buf, char_u *dir_name)); -char_u *get_file_in_dir __ARGS((char_u *fname, char_u *dname)); -void ml_setflags __ARGS((buf_T *buf)); -long ml_find_line_or_offset __ARGS((buf_T *buf, linenr_T lnum, long *offp)); -void goto_byte __ARGS((long cnt)); +extern int ml_open __ARGS((void)); +extern void ml_setname __ARGS((buf_T *buf)); +extern void ml_open_files __ARGS((void)); +extern void ml_open_file __ARGS((buf_T *buf)); +extern void check_need_swap __ARGS((int newfile)); +extern void ml_close __ARGS((buf_T *buf, int del_file)); +extern void ml_close_all __ARGS((int del_file)); +extern void ml_close_notmod __ARGS((void)); +extern void ml_timestamp __ARGS((buf_T *buf)); +extern void ml_recover __ARGS((void)); +extern int recover_names __ARGS((char_u **fname, int list, int nr)); +extern void ml_sync_all __ARGS((int check_file, int check_char)); +extern void ml_preserve __ARGS((buf_T *buf, int message)); +extern char_u *ml_get __ARGS((linenr_T lnum)); +extern char_u *ml_get_pos __ARGS((pos_T *pos)); +extern char_u *ml_get_curline __ARGS((void)); +extern char_u *ml_get_cursor __ARGS((void)); +extern char_u *ml_get_buf __ARGS((buf_T *buf, linenr_T lnum, int will_change)); +extern int ml_line_alloced __ARGS((void)); +extern int ml_append __ARGS((linenr_T lnum, char_u *line, colnr_T len, int newfile)); +extern int ml_replace __ARGS((linenr_T lnum, char_u *line, int copy)); +extern int ml_delete __ARGS((linenr_T lnum, int message)); +extern void ml_setmarked __ARGS((linenr_T lnum)); +extern linenr_T ml_firstmarked __ARGS((void)); +extern void ml_clearmarked __ARGS((void)); +extern char_u *makeswapname __ARGS((char_u *fname, char_u *ffname, buf_T *buf, char_u *dir_name)); +extern char_u *get_file_in_dir __ARGS((char_u *fname, char_u *dname)); +extern void ml_setflags __ARGS((buf_T *buf)); +extern long ml_find_line_or_offset __ARGS((buf_T *buf, linenr_T lnum, long *offp)); +extern void goto_byte __ARGS((long cnt)); /* vim: set ft=c : */ diff --git a/src/version.h b/src/version.h index 8e3ec02942..abd2d27998 100644 --- a/src/version.h +++ b/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 Dec 6)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 6, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 7)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 7, compiled " |