diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/auto/configure | 8 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/if_python.c | 2 | ||||
| -rw-r--r-- | src/macros.h | 11 | ||||
| -rw-r--r-- | src/nbdebug.c | 2 | ||||
| -rw-r--r-- | src/testdir/test58.in | 2 | ||||
| -rw-r--r-- | src/testdir/test59.in | 2 | ||||
| -rw-r--r-- | src/version.h | 4 | ||||
| -rw-r--r-- | src/workshop.c | 1 | ||||
| -rw-r--r-- | src/wsdebug.c | 2 |
10 files changed, 16 insertions, 20 deletions
diff --git a/src/auto/configure b/src/auto/configure index 55d38ff41..ecb716182 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -1029,7 +1029,7 @@ gives unlimited permission to copy, distribute and modify it. _ACEOF exit 0 fi -exec 5>config.log +exec 5>auto/config.log cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -14861,7 +14861,7 @@ echo "$as_me:$LINENO: checking how to create tags" >&5 echo $ECHO_N "checking how to create tags... $ECHO_C" >&6 test -f tags && mv tags tags.save if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then - TAGPRG="ctags" + TAGPRG="ctags -I INIT+" else (eval etags /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags" (eval etags -c /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags -c" @@ -16404,7 +16404,7 @@ exec 6>&1 # Open the log real soon, to keep \$[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. Logging --version etc. is OK. -exec 5>>config.log +exec 5>>auto/config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX @@ -17244,7 +17244,7 @@ if test "$no_create" != yes; then ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log + exec 5>>auto/config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } diff --git a/src/configure.in b/src/configure.in index 3280e1763..e9f21a2ca 100644 --- a/src/configure.in +++ b/src/configure.in @@ -2902,7 +2902,7 @@ dnl -i+m to test for older Exuberant ctags AC_MSG_CHECKING(how to create tags) test -f tags && mv tags tags.save if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then - TAGPRG="ctags" + TAGPRG="ctags -I INIT+" else (eval etags /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags" (eval etags -c /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags -c" diff --git a/src/if_python.c b/src/if_python.c index 8aca83518..1b5d0e33b 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -19,8 +19,6 @@ #include "vim.h" -#include <stdio.h> -#include <stdarg.h> #include <limits.h> /* Python.h defines _POSIX_THREADS itself (if needed) */ diff --git a/src/macros.h b/src/macros.h index 0e258dfc2..69c32ca80 100644 --- a/src/macros.h +++ b/src/macros.h @@ -251,15 +251,18 @@ * mb_ptr_back(): backup a pointer to the previous character, taking care of * multi-byte characters if needed. * MB_COPY_CHAR(f, t): copy one char from "f" to "t" and advance the pointers. + * PTR2CHAR(): get character from pointer. */ #ifdef FEAT_MBYTE # define mb_ptr_adv(p) p += has_mbyte ? (*mb_ptr2len_check)(p) : 1 # define mb_ptr_back(s, p) p -= has_mbyte ? ((*mb_head_off)(s, p - 1) + 1) : 1 # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++ # define MB_CHARLEN(p) (has_mbyte ? mb_charlen(p) : STRLEN(p)) +# define PTR2CHAR(p) (has_mbyte ? mb_ptr2char(p) : *(p)) #else -# define mb_ptr_adv(p) ++p -# define mb_ptr_back(s, p) --p -# define MB_COPY_CHAR(f, t) *t++ = *f++ -# define MB_CHARLEN(p) STRLEN(p) +# define mb_ptr_adv(p) ++p +# define mb_ptr_back(s, p) --p +# define MB_COPY_CHAR(f, t) *t++ = *f++ +# define MB_CHARLEN(p) STRLEN(p) +# define PTR2CHAR(p) (*(p)) #endif diff --git a/src/nbdebug.c b/src/nbdebug.c index 7c7564558..d73a5e5e8 100644 --- a/src/nbdebug.c +++ b/src/nbdebug.c @@ -27,8 +27,6 @@ #ifdef NBDEBUG -#include <stdarg.h> - #include "vim.h" FILE *nb_debug = NULL; diff --git a/src/testdir/test58.in b/src/testdir/test58.in index e03c8e05c..e05326137 100644 --- a/src/testdir/test58.in +++ b/src/testdir/test58.in @@ -342,7 +342,7 @@ PFX I N 1 PFX I 0 in . PFX O Y 1 -PFX O 0 out . +PFX O 0 out [a-z] SFX S Y 2 SFX S 0 s [^s] diff --git a/src/testdir/test59.in b/src/testdir/test59.in index 6b3a30d96..a49514fa5 100644 --- a/src/testdir/test59.in +++ b/src/testdir/test59.in @@ -346,7 +346,7 @@ PFX I N 1 PFX I 0 in . PFX O Y 1 -PFX O 0 out . +PFX O 0 out [a-z] SFX S Y 2 SFX S 0 s [^s] diff --git a/src/version.h b/src/version.h index 661dc4f29..cd5bf8b54 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 Jul 30)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 30, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 31)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 31, compiled " diff --git a/src/workshop.c b/src/workshop.c index 27323d4b1..66365b102 100644 --- a/src/workshop.c +++ b/src/workshop.c @@ -13,7 +13,6 @@ #endif #include <stdio.h> #include <stdlib.h> -#include <stdarg.h> #include <fcntl.h> #include <sys/types.h> #include <netdb.h> diff --git a/src/wsdebug.c b/src/wsdebug.c index 2707fae20..f41299a54 100644 --- a/src/wsdebug.c +++ b/src/wsdebug.c @@ -31,8 +31,6 @@ #ifdef WSDEBUG -#include <stdarg.h> - #include "vim.h" FILE *ws_debug = NULL; |