|
 |
81c2858 |
To: vim-dev@vim.org
|
|
|
81c2858 |
Subject: Patch 7.2.174
|
|
|
81c2858 |
Fcc: outbox
|
|
|
81c2858 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
81c2858 |
Mime-Version: 1.0
|
|
|
81c2858 |
Content-Type: text/plain; charset=UTF-8
|
|
|
81c2858 |
Content-Transfer-Encoding: 8bit
|
|
|
81c2858 |
------------
|
|
|
81c2858 |
|
|
|
81c2858 |
Patch 7.2.174
|
|
|
81c2858 |
Problem: Too many warnings from gcc -Wextra.
|
|
|
81c2858 |
Solution: Change initializer. Add UNUSED. Add type casts.
|
|
|
81c2858 |
Files: src/edit.c, src/eval.c, src/ex_cmds.c, src/ex_docmd.c,
|
|
|
81c2858 |
src/ex_getln.c, src/fileio.c, getchar.c, globals.h, main.c,
|
|
|
81c2858 |
memline.c, message.c, src/misc1.c, src/move.c, src/normal.c,
|
|
|
81c2858 |
src/option.c, src/os_unix.c, src/os_unix.h, src/regexp.c,
|
|
|
81c2858 |
src/search.c, src/tag.c
|
|
|
81c2858 |
|
|
|
81c2858 |
|
|
|
81c2858 |
*** ../vim-7.2.173/src/edit.c 2009-05-14 22:19:19.000000000 +0200
|
|
|
81c2858 |
--- src/edit.c 2009-05-15 21:06:07.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8991,8997 ****
|
|
|
81c2858 |
foldOpenCursor();
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
undisplay_dollar();
|
|
|
81c2858 |
! if (gchar_cursor() != NUL || virtual_active()
|
|
|
81c2858 |
)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
start_arrow(&curwin->w_cursor);
|
|
|
81c2858 |
--- 8992,9001 ----
|
|
|
81c2858 |
foldOpenCursor();
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
undisplay_dollar();
|
|
|
81c2858 |
! if (gchar_cursor() != NUL
|
|
|
81c2858 |
! #ifdef FEAT_VIRTUALEDIT
|
|
|
81c2858 |
! || virtual_active()
|
|
|
81c2858 |
! #endif
|
|
|
81c2858 |
)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
start_arrow(&curwin->w_cursor);
|
|
|
81c2858 |
*** ../vim-7.2.173/src/eval.c 2009-04-22 16:07:57.000000000 +0200
|
|
|
81c2858 |
--- src/eval.c 2009-05-15 21:18:08.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8303,8312 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "argc()" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_argc(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
rettv->vval.v_number = ARGCOUNT;
|
|
|
81c2858 |
--- 8303,8311 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "argc()" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_argc(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars UNUSED;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
rettv->vval.v_number = ARGCOUNT;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8315,8324 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "argidx()" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_argidx(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
rettv->vval.v_number = curwin->w_arg_idx;
|
|
|
81c2858 |
--- 8314,8322 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "argidx()" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_argidx(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars UNUSED;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
rettv->vval.v_number = curwin->w_arg_idx;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8396,8405 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "browse(save, title, initdir, default)" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_browse(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_BROWSE
|
|
|
81c2858 |
--- 8394,8402 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "browse(save, title, initdir, default)" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_browse(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars UNUSED;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_BROWSE
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8431,8440 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "browsedir(title, initdir)" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_browsedir(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_BROWSE
|
|
|
81c2858 |
--- 8428,8436 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "browsedir(title, initdir)" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_browsedir(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars UNUSED;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_BROWSE
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8801,8810 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "changenr()" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_changenr(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
rettv->vval.v_number = curbuf->b_u_seq_cur;
|
|
|
81c2858 |
--- 8797,8805 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "changenr()" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_changenr(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars UNUSED;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
rettv->vval.v_number = curbuf->b_u_seq_cur;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8854,8863 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "clearmatches()" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_clearmatches(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_SEARCH_EXTRA
|
|
|
81c2858 |
--- 8849,8857 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* "clearmatches()" function
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
f_clearmatches(argvars, rettv)
|
|
|
81c2858 |
! typval_T *argvars UNUSED;
|
|
|
81c2858 |
typval_T *rettv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_SEARCH_EXTRA
|
|
|
81c2858 |
*** ../vim-7.2.173/src/ex_cmds.c 2009-05-14 22:19:19.000000000 +0200
|
|
|
81c2858 |
--- src/ex_cmds.c 2009-05-15 20:42:18.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4040,4047 ****
|
|
|
81c2858 |
--- 4040,4049 ----
|
|
|
81c2858 |
bigness = curwin->w_height;
|
|
|
81c2858 |
else if (firstwin == lastwin)
|
|
|
81c2858 |
bigness = curwin->w_p_scr * 2;
|
|
|
81c2858 |
+ #ifdef FEAT_WINDOWS
|
|
|
81c2858 |
else
|
|
|
81c2858 |
bigness = curwin->w_height - 3;
|
|
|
81c2858 |
+ #endif
|
|
|
81c2858 |
if (bigness < 1)
|
|
|
81c2858 |
bigness = 1;
|
|
|
81c2858 |
|
|
|
81c2858 |
*** ../vim-7.2.173/src/ex_docmd.c 2009-05-13 18:54:14.000000000 +0200
|
|
|
81c2858 |
--- src/ex_docmd.c 2009-05-15 20:47:58.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1578,1588 ****
|
|
|
81c2858 |
* If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals
|
|
|
81c2858 |
* "func". * Otherwise return TRUE when "fgetline" equals "func".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
getline_equal(fgetline, cookie, func)
|
|
|
81c2858 |
char_u *(*fgetline) __ARGS((int, void *, int));
|
|
|
81c2858 |
! void *cookie; /* argument for fgetline() */
|
|
|
81c2858 |
char_u *(*func) __ARGS((int, void *, int));
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_EVAL
|
|
|
81c2858 |
--- 1578,1587 ----
|
|
|
81c2858 |
* If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals
|
|
|
81c2858 |
* "func". * Otherwise return TRUE when "fgetline" equals "func".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
getline_equal(fgetline, cookie, func)
|
|
|
81c2858 |
char_u *(*fgetline) __ARGS((int, void *, int));
|
|
|
81c2858 |
! void *cookie UNUSED; /* argument for fgetline() */
|
|
|
81c2858 |
char_u *(*func) __ARGS((int, void *, int));
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_EVAL
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1610,1619 ****
|
|
|
81c2858 |
* If "fgetline" is get_loop_line(), return the cookie used by the original
|
|
|
81c2858 |
* getline function. Otherwise return "cookie".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void *
|
|
|
81c2858 |
getline_cookie(fgetline, cookie)
|
|
|
81c2858 |
! char_u *(*fgetline) __ARGS((int, void *, int));
|
|
|
81c2858 |
void *cookie; /* argument for fgetline() */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
# ifdef FEAT_EVAL
|
|
|
81c2858 |
--- 1609,1617 ----
|
|
|
81c2858 |
* If "fgetline" is get_loop_line(), return the cookie used by the original
|
|
|
81c2858 |
* getline function. Otherwise return "cookie".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void *
|
|
|
81c2858 |
getline_cookie(fgetline, cookie)
|
|
|
81c2858 |
! char_u *(*fgetline) __ARGS((int, void *, int)) UNUSED;
|
|
|
81c2858 |
void *cookie; /* argument for fgetline() */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
# ifdef FEAT_EVAL
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2754,2764 ****
|
|
|
81c2858 |
* "full" is set to TRUE if the whole command name matched.
|
|
|
81c2858 |
* Returns NULL for an ambiguous user command.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static char_u *
|
|
|
81c2858 |
find_command(eap, full)
|
|
|
81c2858 |
exarg_T *eap;
|
|
|
81c2858 |
! int *full;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int len;
|
|
|
81c2858 |
char_u *p;
|
|
|
81c2858 |
--- 2752,2761 ----
|
|
|
81c2858 |
* "full" is set to TRUE if the whole command name matched.
|
|
|
81c2858 |
* Returns NULL for an ambiguous user command.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static char_u *
|
|
|
81c2858 |
find_command(eap, full)
|
|
|
81c2858 |
exarg_T *eap;
|
|
|
81c2858 |
! int *full UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int len;
|
|
|
81c2858 |
char_u *p;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5053,5062 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Function given to ExpandGeneric() to obtain the list of command names.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
get_command_name(xp, idx)
|
|
|
81c2858 |
! expand_T *xp;
|
|
|
81c2858 |
int idx;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (idx >= (int)CMD_SIZE)
|
|
|
81c2858 |
--- 5050,5058 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Function given to ExpandGeneric() to obtain the list of command names.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
get_command_name(xp, idx)
|
|
|
81c2858 |
! expand_T *xp UNUSED;
|
|
|
81c2858 |
int idx;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (idx >= (int)CMD_SIZE)
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5573,5582 ****
|
|
|
81c2858 |
* ":comclear"
|
|
|
81c2858 |
* Clear all user commands, global and for current buffer.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
ex_comclear(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
uc_clear(&ucmds);
|
|
|
81c2858 |
uc_clear(&curbuf->b_ucmds);
|
|
|
81c2858 |
--- 5569,5577 ----
|
|
|
81c2858 |
* ":comclear"
|
|
|
81c2858 |
* Clear all user commands, global and for current buffer.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
ex_comclear(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
uc_clear(&ucmds);
|
|
|
81c2858 |
uc_clear(&curbuf->b_ucmds);
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6072,6081 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Function given to ExpandGeneric() to obtain the list of user command names.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
get_user_commands(xp, idx)
|
|
|
81c2858 |
! expand_T *xp;
|
|
|
81c2858 |
int idx;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (idx < curbuf->b_ucmds.ga_len)
|
|
|
81c2858 |
--- 6067,6075 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Function given to ExpandGeneric() to obtain the list of user command names.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
get_user_commands(xp, idx)
|
|
|
81c2858 |
! expand_T *xp UNUSED;
|
|
|
81c2858 |
int idx;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (idx < curbuf->b_ucmds.ga_len)
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6090,6099 ****
|
|
|
81c2858 |
* Function given to ExpandGeneric() to obtain the list of user command
|
|
|
81c2858 |
* attributes.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
get_user_cmd_flags(xp, idx)
|
|
|
81c2858 |
! expand_T *xp;
|
|
|
81c2858 |
int idx;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
static char *user_cmd_flags[] =
|
|
|
81c2858 |
--- 6084,6092 ----
|
|
|
81c2858 |
* Function given to ExpandGeneric() to obtain the list of user command
|
|
|
81c2858 |
* attributes.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
get_user_cmd_flags(xp, idx)
|
|
|
81c2858 |
! expand_T *xp UNUSED;
|
|
|
81c2858 |
int idx;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
static char *user_cmd_flags[] =
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6108,6117 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Function given to ExpandGeneric() to obtain the list of values for -nargs.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
get_user_cmd_nargs(xp, idx)
|
|
|
81c2858 |
! expand_T *xp;
|
|
|
81c2858 |
int idx;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};
|
|
|
81c2858 |
--- 6101,6109 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Function given to ExpandGeneric() to obtain the list of values for -nargs.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
get_user_cmd_nargs(xp, idx)
|
|
|
81c2858 |
! expand_T *xp UNUSED;
|
|
|
81c2858 |
int idx;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
static char *user_cmd_nargs[] = {"0", "1", "*", "?", "+"};
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6124,6133 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Function given to ExpandGeneric() to obtain the list of values for -complete.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
get_user_cmd_complete(xp, idx)
|
|
|
81c2858 |
! expand_T *xp;
|
|
|
81c2858 |
int idx;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
return (char_u *)command_complete[idx].name;
|
|
|
81c2858 |
--- 6116,6124 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Function given to ExpandGeneric() to obtain the list of values for -complete.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
get_user_cmd_complete(xp, idx)
|
|
|
81c2858 |
! expand_T *xp UNUSED;
|
|
|
81c2858 |
int idx;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
return (char_u *)command_complete[idx].name;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6305,6314 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":cquit".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_cquit(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
getout(1); /* this does not always pass on the exit code to the Manx
|
|
|
81c2858 |
compiler. why? */
|
|
|
81c2858 |
--- 6296,6304 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":cquit".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_cquit(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
getout(1); /* this does not always pass on the exit code to the Manx
|
|
|
81c2858 |
compiler. why? */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6750,6759 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":shell".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_shell(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
do_shell(NULL, 0);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
--- 6740,6748 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":shell".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_shell(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
do_shell(NULL, 0);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 7057,7066 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":preserve".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_preserve(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
curbuf->b_flags |= BF_PRESERVED;
|
|
|
81c2858 |
ml_preserve(curbuf, TRUE);
|
|
|
81c2858 |
--- 7046,7054 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":preserve".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_preserve(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
curbuf->b_flags |= BF_PRESERVED;
|
|
|
81c2858 |
ml_preserve(curbuf, TRUE);
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 7292,7301 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* :tabs command: List tabs and their contents.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_tabs(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
tabpage_T *tp;
|
|
|
81c2858 |
win_T *wp;
|
|
|
81c2858 |
--- 7280,7288 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* :tabs command: List tabs and their contents.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_tabs(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
tabpage_T *tp;
|
|
|
81c2858 |
win_T *wp;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 7482,7488 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":edit <file>" command and alikes.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
do_exedit(eap, old_curwin)
|
|
|
81c2858 |
exarg_T *eap;
|
|
|
81c2858 |
--- 7469,7474 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 7694,7703 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_swapname(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL)
|
|
|
81c2858 |
MSG(_("No swap file"));
|
|
|
81c2858 |
--- 7680,7688 ----
|
|
|
81c2858 |
}
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_swapname(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL)
|
|
|
81c2858 |
MSG(_("No swap file"));
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 7710,7719 ****
|
|
|
81c2858 |
* offset.
|
|
|
81c2858 |
* (1998-11-02 16:21:01 R. Edward Ralston <eralston@computer.org>)
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_syncbind(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_SCROLLBIND
|
|
|
81c2858 |
win_T *wp;
|
|
|
81c2858 |
--- 7695,7703 ----
|
|
|
81c2858 |
* offset.
|
|
|
81c2858 |
* (1998-11-02 16:21:01 R. Edward Ralston <eralston@computer.org>)
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_syncbind(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_SCROLLBIND
|
|
|
81c2858 |
win_T *wp;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 7983,7992 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":pwd".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_pwd(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (mch_dirname(NameBuff, MAXPATHL) == OK)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 7967,7975 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":pwd".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_pwd(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (mch_dirname(NameBuff, MAXPATHL) == OK)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8417,8426 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":undo".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_undo(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (eap->addr_count == 1) /* :undo 123 */
|
|
|
81c2858 |
undo_time(eap->line2, FALSE, TRUE);
|
|
|
81c2858 |
--- 8400,8408 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":undo".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_undo(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (eap->addr_count == 1) /* :undo 123 */
|
|
|
81c2858 |
undo_time(eap->line2, FALSE, TRUE);
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8431,8440 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":redo".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_redo(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
u_redo(1);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
--- 8413,8421 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":redo".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_redo(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
u_redo(1);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8442,8448 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":earlier" and ":later".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_later(eap)
|
|
|
81c2858 |
exarg_T *eap;
|
|
|
81c2858 |
--- 8423,8428 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8627,8636 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":redrawstatus": force redraw of status line(s)
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_redrawstatus(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#if defined(FEAT_WINDOWS)
|
|
|
81c2858 |
int r = RedrawingDisabled;
|
|
|
81c2858 |
--- 8607,8615 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":redrawstatus": force redraw of status line(s)
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_redrawstatus(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#if defined(FEAT_WINDOWS)
|
|
|
81c2858 |
int r = RedrawingDisabled;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 8891,8901 ****
|
|
|
81c2858 |
|
|
|
81c2858 |
#if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \
|
|
|
81c2858 |
|| defined(PROTO)
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
vim_mkdir_emsg(name, prot)
|
|
|
81c2858 |
char_u *name;
|
|
|
81c2858 |
! int prot;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (vim_mkdir(name, prot) != 0)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 8870,8879 ----
|
|
|
81c2858 |
|
|
|
81c2858 |
#if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \
|
|
|
81c2858 |
|| defined(PROTO)
|
|
|
81c2858 |
int
|
|
|
81c2858 |
vim_mkdir_emsg(name, prot)
|
|
|
81c2858 |
char_u *name;
|
|
|
81c2858 |
! int prot UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (vim_mkdir(name, prot) != 0)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 10968,10977 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_digraphs(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_DIGRAPHS
|
|
|
81c2858 |
if (*eap->arg != NUL)
|
|
|
81c2858 |
--- 10946,10954 ----
|
|
|
81c2858 |
}
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_digraphs(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_DIGRAPHS
|
|
|
81c2858 |
if (*eap->arg != NUL)
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 11005,11014 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":nohlsearch"
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_nohlsearch(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
no_hlsearch = TRUE;
|
|
|
81c2858 |
redraw_all_later(SOME_VALID);
|
|
|
81c2858 |
--- 10982,10990 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":nohlsearch"
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_nohlsearch(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
no_hlsearch = TRUE;
|
|
|
81c2858 |
redraw_all_later(SOME_VALID);
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 11087,11096 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":X": Get crypt key
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_X(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
(void)get_crypt_key(TRUE, TRUE);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
--- 11063,11071 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* ":X": Get crypt key
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
ex_X(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
(void)get_crypt_key(TRUE, TRUE);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
*** ../vim-7.2.173/src/ex_getln.c 2009-04-29 18:44:38.000000000 +0200
|
|
|
81c2858 |
--- src/ex_getln.c 2009-05-15 20:49:22.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 140,150 ****
|
|
|
81c2858 |
* Return pointer to allocated string if there is a commandline, NULL
|
|
|
81c2858 |
* otherwise.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
getcmdline(firstc, count, indent)
|
|
|
81c2858 |
int firstc;
|
|
|
81c2858 |
! long count; /* only used for incremental search */
|
|
|
81c2858 |
int indent; /* indent for inside conditionals */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int c;
|
|
|
81c2858 |
--- 140,149 ----
|
|
|
81c2858 |
* Return pointer to allocated string if there is a commandline, NULL
|
|
|
81c2858 |
* otherwise.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
getcmdline(firstc, count, indent)
|
|
|
81c2858 |
int firstc;
|
|
|
81c2858 |
! long count UNUSED; /* only used for incremental search */
|
|
|
81c2858 |
int indent; /* indent for inside conditionals */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int c;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2113,2123 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Get an Ex command line for the ":" command.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
! getexline(c, dummy, indent)
|
|
|
81c2858 |
int c; /* normally ':', NUL for ":append" */
|
|
|
81c2858 |
! void *dummy; /* cookie not used */
|
|
|
81c2858 |
int indent; /* indent for inside conditionals */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* When executing a register, remove ':' that's in front of each line. */
|
|
|
81c2858 |
--- 2112,2121 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Get an Ex command line for the ":" command.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
! getexline(c, cookie, indent)
|
|
|
81c2858 |
int c; /* normally ':', NUL for ":append" */
|
|
|
81c2858 |
! void *cookie UNUSED;
|
|
|
81c2858 |
int indent; /* indent for inside conditionals */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* When executing a register, remove ':' that's in front of each line. */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2132,2143 ****
|
|
|
81c2858 |
* mappings or abbreviations.
|
|
|
81c2858 |
* Returns a string in allocated memory or NULL.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
! getexmodeline(promptc, dummy, indent)
|
|
|
81c2858 |
int promptc; /* normally ':', NUL for ":append" and '?' for
|
|
|
81c2858 |
:s prompt */
|
|
|
81c2858 |
! void *dummy; /* cookie not used */
|
|
|
81c2858 |
int indent; /* indent for inside conditionals */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
garray_T line_ga;
|
|
|
81c2858 |
--- 2130,2140 ----
|
|
|
81c2858 |
* mappings or abbreviations.
|
|
|
81c2858 |
* Returns a string in allocated memory or NULL.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
! getexmodeline(promptc, cookie, indent)
|
|
|
81c2858 |
int promptc; /* normally ':', NUL for ":append" and '?' for
|
|
|
81c2858 |
:s prompt */
|
|
|
81c2858 |
! void *cookie UNUSED;
|
|
|
81c2858 |
int indent; /* indent for inside conditionals */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
garray_T line_ga;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3832,3842 ****
|
|
|
81c2858 |
* Returns EXPAND_NOTHING when the character that triggered expansion should
|
|
|
81c2858 |
* be inserted like a normal character.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static int
|
|
|
81c2858 |
showmatches(xp, wildmenu)
|
|
|
81c2858 |
expand_T *xp;
|
|
|
81c2858 |
! int wildmenu;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m])
|
|
|
81c2858 |
int num_files;
|
|
|
81c2858 |
--- 3829,3838 ----
|
|
|
81c2858 |
* Returns EXPAND_NOTHING when the character that triggered expansion should
|
|
|
81c2858 |
* be inserted like a normal character.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static int
|
|
|
81c2858 |
showmatches(xp, wildmenu)
|
|
|
81c2858 |
expand_T *xp;
|
|
|
81c2858 |
! int wildmenu UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#define L_SHOWFILE(m) (showtail ? sm_gettail(files_found[m]) : files_found[m])
|
|
|
81c2858 |
int num_files;
|
|
|
81c2858 |
*** ../vim-7.2.173/src/fileio.c 2009-05-13 20:47:07.000000000 +0200
|
|
|
81c2858 |
--- src/fileio.c 2009-05-15 20:52:40.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3498,3504 ****
|
|
|
81c2858 |
if (mch_stat((char *)IObuff, &st) < 0
|
|
|
81c2858 |
|| st.st_uid != st_old.st_uid
|
|
|
81c2858 |
|| st.st_gid != st_old.st_gid
|
|
|
81c2858 |
! || st.st_mode != perm)
|
|
|
81c2858 |
backup_copy = TRUE;
|
|
|
81c2858 |
# endif
|
|
|
81c2858 |
/* Close the file before removing it, on MS-Windows we
|
|
|
81c2858 |
--- 3498,3504 ----
|
|
|
81c2858 |
if (mch_stat((char *)IObuff, &st) < 0
|
|
|
81c2858 |
|| st.st_uid != st_old.st_uid
|
|
|
81c2858 |
|| st.st_gid != st_old.st_gid
|
|
|
81c2858 |
! || (long)st.st_mode != perm)
|
|
|
81c2858 |
backup_copy = TRUE;
|
|
|
81c2858 |
# endif
|
|
|
81c2858 |
/* Close the file before removing it, on MS-Windows we
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5963,5969 ****
|
|
|
81c2858 |
else if (*ext == '.')
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
{
|
|
|
81c2858 |
! if (s - ptr > (size_t)8)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
s = ptr + 8;
|
|
|
81c2858 |
*s = '\0';
|
|
|
81c2858 |
--- 5971,5977 ----
|
|
|
81c2858 |
else if (*ext == '.')
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
{
|
|
|
81c2858 |
! if ((size_t)(s - ptr) > (size_t)8)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
s = ptr + 8;
|
|
|
81c2858 |
*s = '\0';
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6460,6470 ****
|
|
|
81c2858 |
* return 2 if a message has been displayed.
|
|
|
81c2858 |
* return 0 otherwise.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
buf_check_timestamp(buf, focus)
|
|
|
81c2858 |
buf_T *buf;
|
|
|
81c2858 |
! int focus; /* called for GUI focus event */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
struct stat st;
|
|
|
81c2858 |
int stat_res;
|
|
|
81c2858 |
--- 6468,6477 ----
|
|
|
81c2858 |
* return 2 if a message has been displayed.
|
|
|
81c2858 |
* return 0 otherwise.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
buf_check_timestamp(buf, focus)
|
|
|
81c2858 |
buf_T *buf;
|
|
|
81c2858 |
! int focus UNUSED; /* called for GUI focus event */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
struct stat st;
|
|
|
81c2858 |
int stat_res;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6868,6879 ****
|
|
|
81c2858 |
/* Careful: autocommands may have made "buf" invalid! */
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
buf_store_time(buf, st, fname)
|
|
|
81c2858 |
buf_T *buf;
|
|
|
81c2858 |
struct stat *st;
|
|
|
81c2858 |
! char_u *fname;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
buf->b_mtime = (long)st->st_mtime;
|
|
|
81c2858 |
buf->b_orig_size = (size_t)st->st_size;
|
|
|
81c2858 |
--- 6875,6885 ----
|
|
|
81c2858 |
/* Careful: autocommands may have made "buf" invalid! */
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
void
|
|
|
81c2858 |
buf_store_time(buf, st, fname)
|
|
|
81c2858 |
buf_T *buf;
|
|
|
81c2858 |
struct stat *st;
|
|
|
81c2858 |
! char_u *fname UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
buf->b_mtime = (long)st->st_mtime;
|
|
|
81c2858 |
buf->b_orig_size = (size_t)st->st_size;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6936,6945 ****
|
|
|
81c2858 |
* The returned pointer is to allocated memory.
|
|
|
81c2858 |
* The returned pointer is NULL if no valid name was found.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
vim_tempname(extra_char)
|
|
|
81c2858 |
! int extra_char; /* character to use in the name instead of '?' */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef USE_TMPNAM
|
|
|
81c2858 |
char_u itmp[L_tmpnam]; /* use tmpnam() */
|
|
|
81c2858 |
--- 6942,6950 ----
|
|
|
81c2858 |
* The returned pointer is to allocated memory.
|
|
|
81c2858 |
* The returned pointer is NULL if no valid name was found.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
vim_tempname(extra_char)
|
|
|
81c2858 |
! int extra_char UNUSED; /* char to use in the name instead of '?' */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef USE_TMPNAM
|
|
|
81c2858 |
char_u itmp[L_tmpnam]; /* use tmpnam() */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 6968,6974 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Try the entries in TEMPDIRNAMES to create the temp directory.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
! for (i = 0; i < sizeof(tempdirs) / sizeof(char *); ++i)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* expand $TMP, leave room for "/v1100000/999999999" */
|
|
|
81c2858 |
expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
|
|
|
81c2858 |
--- 6973,6979 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Try the entries in TEMPDIRNAMES to create the temp directory.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
! for (i = 0; i < (int)(sizeof(tempdirs) / sizeof(char *)); ++i)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* expand $TMP, leave room for "/v1100000/999999999" */
|
|
|
81c2858 |
expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 9588,9600 ****
|
|
|
81c2858 |
*
|
|
|
81c2858 |
* Returns NULL when out of memory.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
|
|
|
81c2858 |
char_u *pat;
|
|
|
81c2858 |
char_u *pat_end; /* first char after pattern or NULL */
|
|
|
81c2858 |
char *allow_dirs; /* Result passed back out in here */
|
|
|
81c2858 |
! int no_bslash; /* Don't use a backward slash as pathsep */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int size;
|
|
|
81c2858 |
char_u *endp;
|
|
|
81c2858 |
--- 9593,9604 ----
|
|
|
81c2858 |
*
|
|
|
81c2858 |
* Returns NULL when out of memory.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
char_u *
|
|
|
81c2858 |
file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash)
|
|
|
81c2858 |
char_u *pat;
|
|
|
81c2858 |
char_u *pat_end; /* first char after pattern or NULL */
|
|
|
81c2858 |
char *allow_dirs; /* Result passed back out in here */
|
|
|
81c2858 |
! int no_bslash UNUSED; /* Don't use a backward slash as pathsep */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int size;
|
|
|
81c2858 |
char_u *endp;
|
|
|
81c2858 |
*** ../vim-7.2.173/src/misc1.c 2009-04-29 11:00:09.000000000 +0200
|
|
|
81c2858 |
--- src/misc1.c 2009-05-15 20:59:08.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2188,2199 ****
|
|
|
81c2858 |
*
|
|
|
81c2858 |
* return FAIL for failure, OK otherwise
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
del_bytes(count, fixpos_arg, use_delcombine)
|
|
|
81c2858 |
long count;
|
|
|
81c2858 |
int fixpos_arg;
|
|
|
81c2858 |
! int use_delcombine; /* 'delcombine' option applies */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
char_u *oldp, *newp;
|
|
|
81c2858 |
colnr_T oldlen;
|
|
|
81c2858 |
--- 2188,2198 ----
|
|
|
81c2858 |
*
|
|
|
81c2858 |
* return FAIL for failure, OK otherwise
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
del_bytes(count, fixpos_arg, use_delcombine)
|
|
|
81c2858 |
long count;
|
|
|
81c2858 |
int fixpos_arg;
|
|
|
81c2858 |
! int use_delcombine UNUSED; /* 'delcombine' option applies */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
char_u *oldp, *newp;
|
|
|
81c2858 |
colnr_T oldlen;
|
|
|
81c2858 |
*** ../vim-7.2.173/src/move.c 2008-11-15 16:05:30.000000000 +0100
|
|
|
81c2858 |
--- src/move.c 2009-05-15 21:00:06.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1238,1248 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Scroll the current window down by "line_count" logical lines. "CTRL-Y"
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
scrolldown(line_count, byfold)
|
|
|
81c2858 |
long line_count;
|
|
|
81c2858 |
! int byfold; /* TRUE: count a closed fold as one line */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
long done = 0; /* total # of physical lines done */
|
|
|
81c2858 |
int wrow;
|
|
|
81c2858 |
--- 1238,1247 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Scroll the current window down by "line_count" logical lines. "CTRL-Y"
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
scrolldown(line_count, byfold)
|
|
|
81c2858 |
long line_count;
|
|
|
81c2858 |
! int byfold UNUSED; /* TRUE: count a closed fold as one line */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
long done = 0; /* total # of physical lines done */
|
|
|
81c2858 |
int wrow;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1349,1359 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Scroll the current window up by "line_count" logical lines. "CTRL-E"
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
scrollup(line_count, byfold)
|
|
|
81c2858 |
long line_count;
|
|
|
81c2858 |
! int byfold; /* TRUE: count a closed fold as one line */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#if defined(FEAT_FOLDING) || defined(FEAT_DIFF)
|
|
|
81c2858 |
linenr_T lnum;
|
|
|
81c2858 |
--- 1348,1357 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Scroll the current window up by "line_count" logical lines. "CTRL-E"
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
scrollup(line_count, byfold)
|
|
|
81c2858 |
long line_count;
|
|
|
81c2858 |
! int byfold UNUSED; /* TRUE: count a closed fold as one line */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#if defined(FEAT_FOLDING) || defined(FEAT_DIFF)
|
|
|
81c2858 |
linenr_T lnum;
|
|
|
81c2858 |
*** ../vim-7.2.173/src/normal.c 2009-04-29 17:39:17.000000000 +0200
|
|
|
81c2858 |
--- src/normal.c 2009-05-15 21:08:07.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 493,506 ****
|
|
|
81c2858 |
int i;
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Fill the index table with a one to one relation. */
|
|
|
81c2858 |
! for (i = 0; i < NV_CMDS_SIZE; ++i)
|
|
|
81c2858 |
nv_cmd_idx[i] = i;
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Sort the commands by the command character. */
|
|
|
81c2858 |
qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare);
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Find the first entry that can't be indexed by the command character. */
|
|
|
81c2858 |
! for (i = 0; i < NV_CMDS_SIZE; ++i)
|
|
|
81c2858 |
if (i != nv_cmds[nv_cmd_idx[i]].cmd_char)
|
|
|
81c2858 |
break;
|
|
|
81c2858 |
nv_max_linear = i - 1;
|
|
|
81c2858 |
--- 493,506 ----
|
|
|
81c2858 |
int i;
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Fill the index table with a one to one relation. */
|
|
|
81c2858 |
! for (i = 0; i < (int)NV_CMDS_SIZE; ++i)
|
|
|
81c2858 |
nv_cmd_idx[i] = i;
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Sort the commands by the command character. */
|
|
|
81c2858 |
qsort((void *)&nv_cmd_idx, (size_t)NV_CMDS_SIZE, sizeof(short), nv_compare);
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Find the first entry that can't be indexed by the command character. */
|
|
|
81c2858 |
! for (i = 0; i < (int)NV_CMDS_SIZE; ++i)
|
|
|
81c2858 |
if (i != nv_cmds[nv_cmd_idx[i]].cmd_char)
|
|
|
81c2858 |
break;
|
|
|
81c2858 |
nv_max_linear = i - 1;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 561,571 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Execute a command in Normal mode.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
normal_cmd(oap, toplevel)
|
|
|
81c2858 |
oparg_T *oap;
|
|
|
81c2858 |
! int toplevel; /* TRUE when called from main() */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
cmdarg_T ca; /* command arguments */
|
|
|
81c2858 |
int c;
|
|
|
81c2858 |
--- 561,570 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Execute a command in Normal mode.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
normal_cmd(oap, toplevel)
|
|
|
81c2858 |
oparg_T *oap;
|
|
|
81c2858 |
! int toplevel UNUSED; /* TRUE when called from main() */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
cmdarg_T ca; /* command arguments */
|
|
|
81c2858 |
int c;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2188,2197 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Handle the "g@" operator: call 'operatorfunc'.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
op_function(oap)
|
|
|
81c2858 |
! oparg_T *oap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_EVAL
|
|
|
81c2858 |
char_u *(argv[1]);
|
|
|
81c2858 |
--- 2187,2195 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Handle the "g@" operator: call 'operatorfunc'.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
op_function(oap)
|
|
|
81c2858 |
! oparg_T *oap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_EVAL
|
|
|
81c2858 |
char_u *(argv[1]);
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4100,4109 ****
|
|
|
81c2858 |
* Command character that doesn't do anything, but unlike nv_ignore() does
|
|
|
81c2858 |
* start edit(). Used for "startinsert" executed while starting up.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED */
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
nv_nop(cap)
|
|
|
81c2858 |
! cmdarg_T *cap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
--- 4098,4106 ----
|
|
|
81c2858 |
* Command character that doesn't do anything, but unlike nv_ignore() does
|
|
|
81c2858 |
* start edit(). Used for "startinsert" executed while starting up.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
nv_nop(cap)
|
|
|
81c2858 |
! cmdarg_T *cap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5241,5247 ****
|
|
|
81c2858 |
if (cap->oap->op_type != OP_NOP
|
|
|
81c2858 |
&& (cap->oap->start.lnum > curbuf->b_ml.ml_line_count
|
|
|
81c2858 |
|| cap->oap->start.col >
|
|
|
81c2858 |
! STRLEN(ml_get(cap->oap->start.lnum))))
|
|
|
81c2858 |
clearopbeep(cap->oap);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
}
|
|
|
81c2858 |
--- 5238,5244 ----
|
|
|
81c2858 |
if (cap->oap->op_type != OP_NOP
|
|
|
81c2858 |
&& (cap->oap->start.lnum > curbuf->b_ml.ml_line_count
|
|
|
81c2858 |
|| cap->oap->start.col >
|
|
|
81c2858 |
! (colnr_T)STRLEN(ml_get(cap->oap->start.lnum))))
|
|
|
81c2858 |
clearopbeep(cap->oap);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
}
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5816,5822 ****
|
|
|
81c2858 |
for (n = cap->count1; n > 0; --n)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if ((!PAST_LINE && oneright() == FAIL)
|
|
|
81c2858 |
! || (PAST_LINE && *ml_get_cursor() == NUL))
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* <Space> wraps to next line if 'whichwrap' has 's'.
|
|
|
81c2858 |
--- 5813,5822 ----
|
|
|
81c2858 |
for (n = cap->count1; n > 0; --n)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if ((!PAST_LINE && oneright() == FAIL)
|
|
|
81c2858 |
! #ifdef FEAT_VISUAL
|
|
|
81c2858 |
! || (PAST_LINE && *ml_get_cursor() == NUL)
|
|
|
81c2858 |
! #endif
|
|
|
81c2858 |
! )
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* <Space> wraps to next line if 'whichwrap' has 's'.
|
|
|
81c2858 |
*** ../vim-7.2.173/src/option.c 2009-03-18 15:40:03.000000000 +0100
|
|
|
81c2858 |
--- src/option.c 2009-05-15 21:08:50.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5302,5315 ****
|
|
|
81c2858 |
* When "set_sid" is zero set the scriptID to current_SID. When "set_sid" is
|
|
|
81c2858 |
* SID_NONE don't set the scriptID. Otherwise set the scriptID to "set_sid".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
set_string_option_direct(name, opt_idx, val, opt_flags, set_sid)
|
|
|
81c2858 |
char_u *name;
|
|
|
81c2858 |
int opt_idx;
|
|
|
81c2858 |
char_u *val;
|
|
|
81c2858 |
int opt_flags; /* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */
|
|
|
81c2858 |
! int set_sid;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
char_u *s;
|
|
|
81c2858 |
char_u **varp;
|
|
|
81c2858 |
--- 5302,5314 ----
|
|
|
81c2858 |
* When "set_sid" is zero set the scriptID to current_SID. When "set_sid" is
|
|
|
81c2858 |
* SID_NONE don't set the scriptID. Otherwise set the scriptID to "set_sid".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
set_string_option_direct(name, opt_idx, val, opt_flags, set_sid)
|
|
|
81c2858 |
char_u *name;
|
|
|
81c2858 |
int opt_idx;
|
|
|
81c2858 |
char_u *val;
|
|
|
81c2858 |
int opt_flags; /* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */
|
|
|
81c2858 |
! int set_sid UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
char_u *s;
|
|
|
81c2858 |
char_u **varp;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 9357,9366 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Check for NULL pointers in a winopt_T and replace them with empty_option.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
check_winopt(wop)
|
|
|
81c2858 |
! winopt_T *wop;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_FOLDING
|
|
|
81c2858 |
check_string_option(&wop->wo_fdi);
|
|
|
81c2858 |
--- 9356,9364 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Check for NULL pointers in a winopt_T and replace them with empty_option.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
check_winopt(wop)
|
|
|
81c2858 |
! winopt_T *wop UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_FOLDING
|
|
|
81c2858 |
check_string_option(&wop->wo_fdi);
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 9382,9391 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Free the allocated memory inside a winopt_T.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
clear_winopt(wop)
|
|
|
81c2858 |
! winopt_T *wop;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_FOLDING
|
|
|
81c2858 |
clear_string_option(&wop->wo_fdi);
|
|
|
81c2858 |
--- 9380,9388 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Free the allocated memory inside a winopt_T.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
clear_winopt(wop)
|
|
|
81c2858 |
! winopt_T *wop UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef FEAT_FOLDING
|
|
|
81c2858 |
clear_string_option(&wop->wo_fdi);
|
|
|
81c2858 |
*** ../vim-7.2.173/src/os_unix.c 2009-05-13 12:46:36.000000000 +0200
|
|
|
81c2858 |
--- src/os_unix.c 2009-05-15 21:13:43.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 458,467 ****
|
|
|
81c2858 |
* Return total amount of memory available in Kbyte.
|
|
|
81c2858 |
* Doesn't change when memory has been allocated.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
long_u
|
|
|
81c2858 |
mch_total_mem(special)
|
|
|
81c2858 |
! int special;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
# ifdef __EMX__
|
|
|
81c2858 |
return ulimit(3, 0L) >> 10; /* always 32MB? */
|
|
|
81c2858 |
--- 458,466 ----
|
|
|
81c2858 |
* Return total amount of memory available in Kbyte.
|
|
|
81c2858 |
* Doesn't change when memory has been allocated.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
long_u
|
|
|
81c2858 |
mch_total_mem(special)
|
|
|
81c2858 |
! int special UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
# ifdef __EMX__
|
|
|
81c2858 |
return ulimit(3, 0L) >> 10; /* always 32MB? */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 815,821 ****
|
|
|
81c2858 |
* Let me try it with a few tricky defines from my own osdef.h (jw).
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
#if defined(SIGWINCH)
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
static RETSIGTYPE
|
|
|
81c2858 |
sig_winch SIGDEFARG(sigarg)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
--- 814,819 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1355,1365 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Check_win checks whether we have an interactive stdout.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
int
|
|
|
81c2858 |
mch_check_win(argc, argv)
|
|
|
81c2858 |
! int argc;
|
|
|
81c2858 |
! char **argv;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef OS2
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
--- 1353,1362 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Check_win checks whether we have an interactive stdout.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
mch_check_win(argc, argv)
|
|
|
81c2858 |
! int argc UNUSED;
|
|
|
81c2858 |
! char **argv UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
#ifdef OS2
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2467,2473 ****
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Catch file names which are too long. */
|
|
|
81c2858 |
! if (retval == FAIL || STRLEN(buf) + STRLEN(fname) >= len)
|
|
|
81c2858 |
return FAIL;
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Do not append ".", "/dir/." is equal to "/dir". */
|
|
|
81c2858 |
--- 2464,2470 ----
|
|
|
81c2858 |
}
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Catch file names which are too long. */
|
|
|
81c2858 |
! if (retval == FAIL || (int)(STRLEN(buf) + STRLEN(fname)) >= len)
|
|
|
81c2858 |
return FAIL;
|
|
|
81c2858 |
|
|
|
81c2858 |
/* Do not append ".", "/dir/." is equal to "/dir". */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2686,2692 ****
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
vim_acl_T
|
|
|
81c2858 |
mch_get_acl(fname)
|
|
|
81c2858 |
! char_u *fname;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
vim_acl_T ret = NULL;
|
|
|
81c2858 |
#ifdef HAVE_POSIX_ACL
|
|
|
81c2858 |
--- 2683,2689 ----
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
vim_acl_T
|
|
|
81c2858 |
mch_get_acl(fname)
|
|
|
81c2858 |
! char_u *fname UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
vim_acl_T ret = NULL;
|
|
|
81c2858 |
#ifdef HAVE_POSIX_ACL
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2746,2752 ****
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
mch_set_acl(fname, aclent)
|
|
|
81c2858 |
! char_u *fname;
|
|
|
81c2858 |
vim_acl_T aclent;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (aclent == NULL)
|
|
|
81c2858 |
--- 2743,2749 ----
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
mch_set_acl(fname, aclent)
|
|
|
81c2858 |
! char_u *fname UNUSED;
|
|
|
81c2858 |
vim_acl_T aclent;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (aclent == NULL)
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2789,2798 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Set hidden flag for "name".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
void
|
|
|
81c2858 |
mch_hide(name)
|
|
|
81c2858 |
! char_u *name;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* can't hide a file */
|
|
|
81c2858 |
}
|
|
|
81c2858 |
--- 2786,2794 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Set hidden flag for "name".
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
mch_hide(name)
|
|
|
81c2858 |
! char_u *name UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* can't hide a file */
|
|
|
81c2858 |
}
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3481,3490 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* set screen mode, always fails.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
int
|
|
|
81c2858 |
mch_screenmode(arg)
|
|
|
81c2858 |
! char_u *arg;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
EMSG(_(e_screenmode));
|
|
|
81c2858 |
return FAIL;
|
|
|
81c2858 |
--- 3477,3485 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* set screen mode, always fails.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
mch_screenmode(arg)
|
|
|
81c2858 |
! char_u *arg UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
EMSG(_(e_screenmode));
|
|
|
81c2858 |
return FAIL;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4189,4197 ****
|
|
|
81c2858 |
{
|
|
|
81c2858 |
s = vim_strchr(lp + written, NL);
|
|
|
81c2858 |
len = write(toshell_fd, (char *)lp + written,
|
|
|
81c2858 |
! s == NULL ? l : s - (lp + written));
|
|
|
81c2858 |
}
|
|
|
81c2858 |
! if (len == l)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* Finished a line, add a NL, unless this line
|
|
|
81c2858 |
* should not have one. */
|
|
|
81c2858 |
--- 4184,4193 ----
|
|
|
81c2858 |
{
|
|
|
81c2858 |
s = vim_strchr(lp + written, NL);
|
|
|
81c2858 |
len = write(toshell_fd, (char *)lp + written,
|
|
|
81c2858 |
! s == NULL ? l
|
|
|
81c2858 |
! : (size_t)(s - (lp + written)));
|
|
|
81c2858 |
}
|
|
|
81c2858 |
! if (len == (int)l)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* Finished a line, add a NL, unless this line
|
|
|
81c2858 |
* should not have one. */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4746,4752 ****
|
|
|
81c2858 |
* Returns also, when a request from Sniff is waiting -- toni.
|
|
|
81c2858 |
* Or when a Linux GPM mouse event is waiting.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /* ARGSUSED */
|
|
|
81c2858 |
#if defined(__BEOS__)
|
|
|
81c2858 |
int
|
|
|
81c2858 |
#else
|
|
|
81c2858 |
--- 4742,4747 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 4755,4761 ****
|
|
|
81c2858 |
RealWaitForChar(fd, msec, check_for_gpm)
|
|
|
81c2858 |
int fd;
|
|
|
81c2858 |
long msec;
|
|
|
81c2858 |
! int *check_for_gpm;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int ret;
|
|
|
81c2858 |
#if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME)
|
|
|
81c2858 |
--- 4750,4756 ----
|
|
|
81c2858 |
RealWaitForChar(fd, msec, check_for_gpm)
|
|
|
81c2858 |
int fd;
|
|
|
81c2858 |
long msec;
|
|
|
81c2858 |
! int *check_for_gpm UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int ret;
|
|
|
81c2858 |
#if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME)
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5572,5578 ****
|
|
|
81c2858 |
i = fread((char *)buffer, 1, len, fd);
|
|
|
81c2858 |
fclose(fd);
|
|
|
81c2858 |
mch_remove(tempname);
|
|
|
81c2858 |
! if (i != len)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* unexpected read error */
|
|
|
81c2858 |
EMSG2(_(e_notread), tempname);
|
|
|
81c2858 |
--- 5567,5573 ----
|
|
|
81c2858 |
i = fread((char *)buffer, 1, len, fd);
|
|
|
81c2858 |
fclose(fd);
|
|
|
81c2858 |
mch_remove(tempname);
|
|
|
81c2858 |
! if (i != (int)len)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* unexpected read error */
|
|
|
81c2858 |
EMSG2(_(e_notread), tempname);
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 5633,5639 ****
|
|
|
81c2858 |
if (shell_style == STYLE_PRINT && !did_find_nul)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* If there is a NUL, set did_find_nul, else set check_spaces */
|
|
|
81c2858 |
! if (len && (int)STRLEN(buffer) < len - 1)
|
|
|
81c2858 |
did_find_nul = TRUE;
|
|
|
81c2858 |
else
|
|
|
81c2858 |
check_spaces = TRUE;
|
|
|
81c2858 |
--- 5628,5634 ----
|
|
|
81c2858 |
if (shell_style == STYLE_PRINT && !did_find_nul)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
/* If there is a NUL, set did_find_nul, else set check_spaces */
|
|
|
81c2858 |
! if (len && (int)STRLEN(buffer) < (int)len - 1)
|
|
|
81c2858 |
did_find_nul = TRUE;
|
|
|
81c2858 |
else
|
|
|
81c2858 |
check_spaces = TRUE;
|
|
|
81c2858 |
*** ../vim-7.2.173/src/os_unix.h 2009-05-13 12:46:36.000000000 +0200
|
|
|
81c2858 |
--- src/os_unix.h 2009-05-15 21:10:31.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 126,132 ****
|
|
|
81c2858 |
# define SIGDUMMYARG 0, 0, (struct sigcontext *)0
|
|
|
81c2858 |
# else
|
|
|
81c2858 |
# define SIGPROTOARG (int)
|
|
|
81c2858 |
! # define SIGDEFARG(s) (s) int s;
|
|
|
81c2858 |
# define SIGDUMMYARG 0
|
|
|
81c2858 |
# endif
|
|
|
81c2858 |
#else
|
|
|
81c2858 |
--- 126,132 ----
|
|
|
81c2858 |
# define SIGDUMMYARG 0, 0, (struct sigcontext *)0
|
|
|
81c2858 |
# else
|
|
|
81c2858 |
# define SIGPROTOARG (int)
|
|
|
81c2858 |
! # define SIGDEFARG(s) (s) int s UNUSED;
|
|
|
81c2858 |
# define SIGDUMMYARG 0
|
|
|
81c2858 |
# endif
|
|
|
81c2858 |
#else
|
|
|
81c2858 |
*** ../vim-7.2.173/src/regexp.c 2009-02-21 22:03:06.000000000 +0100
|
|
|
81c2858 |
--- src/regexp.c 2009-05-15 21:14:18.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 471,477 ****
|
|
|
81c2858 |
|
|
|
81c2858 |
if ((*pp)[1] == ':')
|
|
|
81c2858 |
{
|
|
|
81c2858 |
! for (i = 0; i < sizeof(class_names) / sizeof(*class_names); ++i)
|
|
|
81c2858 |
if (STRNCMP(*pp + 2, class_names[i], STRLEN(class_names[i])) == 0)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
*pp += STRLEN(class_names[i]) + 2;
|
|
|
81c2858 |
--- 471,477 ----
|
|
|
81c2858 |
|
|
|
81c2858 |
if ((*pp)[1] == ':')
|
|
|
81c2858 |
{
|
|
|
81c2858 |
! for (i = 0; i < (int)(sizeof(class_names) / sizeof(*class_names)); ++i)
|
|
|
81c2858 |
if (STRNCMP(*pp + 2, class_names[i], STRLEN(class_names[i])) == 0)
|
|
|
81c2858 |
{
|
|
|
81c2858 |
*pp += STRLEN(class_names[i]) + 2;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 3362,3373 ****
|
|
|
81c2858 |
* Match a regexp against a string ("line" points to the string) or multiple
|
|
|
81c2858 |
* lines ("line" is NULL, use reg_getline()).
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static long
|
|
|
81c2858 |
vim_regexec_both(line, col, tm)
|
|
|
81c2858 |
char_u *line;
|
|
|
81c2858 |
colnr_T col; /* column to start looking for match */
|
|
|
81c2858 |
! proftime_T *tm; /* timeout limit or NULL */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
regprog_T *prog;
|
|
|
81c2858 |
char_u *s;
|
|
|
81c2858 |
--- 3362,3372 ----
|
|
|
81c2858 |
* Match a regexp against a string ("line" points to the string) or multiple
|
|
|
81c2858 |
* lines ("line" is NULL, use reg_getline()).
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static long
|
|
|
81c2858 |
vim_regexec_both(line, col, tm)
|
|
|
81c2858 |
char_u *line;
|
|
|
81c2858 |
colnr_T col; /* column to start looking for match */
|
|
|
81c2858 |
! proftime_T *tm UNUSED; /* timeout limit or NULL */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
regprog_T *prog;
|
|
|
81c2858 |
char_u *s;
|
|
|
81c2858 |
*** ../vim-7.2.173/src/search.c 2009-04-22 18:43:06.000000000 +0200
|
|
|
81c2858 |
--- src/search.c 2009-05-15 21:16:36.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 522,528 ****
|
|
|
81c2858 |
* When FEAT_EVAL is defined, returns the index of the first matching
|
|
|
81c2858 |
* subpattern plus one; one if there was none.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
int
|
|
|
81c2858 |
searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
|
|
|
81c2858 |
win_T *win; /* window to search in; can be NULL for a
|
|
|
81c2858 |
--- 522,527 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 535,541 ****
|
|
|
81c2858 |
int options;
|
|
|
81c2858 |
int pat_use; /* which pattern to use when "pat" is empty */
|
|
|
81c2858 |
linenr_T stop_lnum; /* stop after this line number when != 0 */
|
|
|
81c2858 |
! proftime_T *tm; /* timeout limit or NULL */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int found;
|
|
|
81c2858 |
linenr_T lnum; /* no init to shut up Apollo cc */
|
|
|
81c2858 |
--- 534,540 ----
|
|
|
81c2858 |
int options;
|
|
|
81c2858 |
int pat_use; /* which pattern to use when "pat" is empty */
|
|
|
81c2858 |
linenr_T stop_lnum; /* stop after this line number when != 0 */
|
|
|
81c2858 |
! proftime_T *tm UNUSED; /* timeout limit or NULL */
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int found;
|
|
|
81c2858 |
linenr_T lnum; /* no init to shut up Apollo cc */
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 554,561 ****
|
|
|
81c2858 |
int save_called_emsg = called_emsg;
|
|
|
81c2858 |
#ifdef FEAT_SEARCH_EXTRA
|
|
|
81c2858 |
int break_loop = FALSE;
|
|
|
81c2858 |
- #else
|
|
|
81c2858 |
- # define break_loop FALSE
|
|
|
81c2858 |
#endif
|
|
|
81c2858 |
|
|
|
81c2858 |
if (search_regcomp(pat, RE_SEARCH, pat_use,
|
|
|
81c2858 |
--- 553,558 ----
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 940,946 ****
|
|
|
81c2858 |
* twice.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
if (!p_ws || stop_lnum != 0 || got_int || called_emsg
|
|
|
81c2858 |
! || break_loop || found || loop)
|
|
|
81c2858 |
break;
|
|
|
81c2858 |
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
--- 937,946 ----
|
|
|
81c2858 |
* twice.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
if (!p_ws || stop_lnum != 0 || got_int || called_emsg
|
|
|
81c2858 |
! #ifdef FEAT_SEARCH_EXTRA
|
|
|
81c2858 |
! || break_loop
|
|
|
81c2858 |
! #endif
|
|
|
81c2858 |
! || found || loop)
|
|
|
81c2858 |
break;
|
|
|
81c2858 |
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 958,964 ****
|
|
|
81c2858 |
give_warning((char_u *)_(dir == BACKWARD
|
|
|
81c2858 |
? top_bot_msg : bot_top_msg), TRUE);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
! if (got_int || called_emsg || break_loop)
|
|
|
81c2858 |
break;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
while (--count > 0 && found); /* stop after count matches or no match */
|
|
|
81c2858 |
--- 958,968 ----
|
|
|
81c2858 |
give_warning((char_u *)_(dir == BACKWARD
|
|
|
81c2858 |
? top_bot_msg : bot_top_msg), TRUE);
|
|
|
81c2858 |
}
|
|
|
81c2858 |
! if (got_int || called_emsg
|
|
|
81c2858 |
! #ifdef FEAT_SEARCH_EXTRA
|
|
|
81c2858 |
! || break_loop
|
|
|
81c2858 |
! #endif
|
|
|
81c2858 |
! )
|
|
|
81c2858 |
break;
|
|
|
81c2858 |
}
|
|
|
81c2858 |
while (--count > 0 && found); /* stop after count matches or no match */
|
|
|
81c2858 |
*** ../vim-7.2.173/src/tag.c 2009-02-23 00:53:35.000000000 +0100
|
|
|
81c2858 |
--- src/tag.c 2009-05-15 21:16:59.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 1105,1114 ****
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Print the tag stack
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
do_tags(eap)
|
|
|
81c2858 |
! exarg_T *eap;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int i;
|
|
|
81c2858 |
char_u *name;
|
|
|
81c2858 |
--- 1105,1113 ----
|
|
|
81c2858 |
/*
|
|
|
81c2858 |
* Print the tag stack
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
void
|
|
|
81c2858 |
do_tags(eap)
|
|
|
81c2858 |
! exarg_T *eap UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
int i;
|
|
|
81c2858 |
char_u *name;
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2530,2540 ****
|
|
|
81c2858 |
* Callback function for finding all "tags" and "tags-??" files in
|
|
|
81c2858 |
* 'runtimepath' doc directories.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
- /*ARGSUSED*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
found_tagfile_cb(fname, cookie)
|
|
|
81c2858 |
char_u *fname;
|
|
|
81c2858 |
! void *cookie;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (ga_grow(&tag_fnames, 1) == OK)
|
|
|
81c2858 |
((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] =
|
|
|
81c2858 |
--- 2529,2538 ----
|
|
|
81c2858 |
* Callback function for finding all "tags" and "tags-??" files in
|
|
|
81c2858 |
* 'runtimepath' doc directories.
|
|
|
81c2858 |
*/
|
|
|
81c2858 |
static void
|
|
|
81c2858 |
found_tagfile_cb(fname, cookie)
|
|
|
81c2858 |
char_u *fname;
|
|
|
81c2858 |
! void *cookie UNUSED;
|
|
|
81c2858 |
{
|
|
|
81c2858 |
if (ga_grow(&tag_fnames, 1) == OK)
|
|
|
81c2858 |
((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] =
|
|
|
81c2858 |
*** ../vim-7.2.173/src/version.c 2009-05-14 22:19:19.000000000 +0200
|
|
|
81c2858 |
--- src/version.c 2009-05-15 21:21:44.000000000 +0200
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 678,679 ****
|
|
|
81c2858 |
--- 678,681 ----
|
|
|
81c2858 |
{ /* Add new patch number below this line */
|
|
|
81c2858 |
+ /**/
|
|
|
81c2858 |
+ 174,
|
|
|
81c2858 |
/**/
|
|
|
81c2858 |
|
|
|
81c2858 |
--
|
|
|
81c2858 |
TERRY GILLIAM PLAYED: PATSY (ARTHUR'S TRUSTY STEED), THE GREEN KNIGHT
|
|
|
81c2858 |
SOOTHSAYER, BRIDGEKEEPER, SIR GAWAIN (THE FIRST TO BE
|
|
|
81c2858 |
KILLED BY THE RABBIT)
|
|
|
81c2858 |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
81c2858 |
|
|
|
81c2858 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
81c2858 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
81c2858 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
81c2858 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|