summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-02-21 21:30:39 +0000
committerBram Moolenaar <Bram@vim.org>2009-02-21 21:30:39 +0000
commit926e8157797be061eb99f4e6b9739804c6d4f0b5 (patch)
treedcee4ab5b4205fe3aa05ce887abf8c0bb89e0b6b
parentec90622aaef8f0a7d9dba747a2aaa7897f6bc880 (diff)
downloadvim-git-926e8157797be061eb99f4e6b9739804c6d4f0b5.tar.gz
updated for version 7.2-115v7.2.115
-rw-r--r--src/nbdebug.c37
-rw-r--r--src/nbdebug.h16
-rw-r--r--src/version.c2
3 files changed, 2 insertions, 53 deletions
diff --git a/src/nbdebug.c b/src/nbdebug.c
index 3dfe86ae9..20125ca51 100644
--- a/src/nbdebug.c
+++ b/src/nbdebug.c
@@ -33,7 +33,6 @@ FILE *nb_debug = NULL;
u_int nb_dlevel = 0; /* nb_debug verbosity level */
void nbdb(char *, ...);
-void nbtrace(char *, ...);
static int lookup(char *);
#ifdef USE_NB_ERRORHANDLER
@@ -100,25 +99,6 @@ nbdebug_log_init(
} /* end nbdebug_log_init */
-
-
-void
-nbtrace(
- char *fmt,
- ...)
-{
- va_list ap;
-
- if (nb_debug!= NULL && (nb_dlevel & (NB_TRACE | NB_TRACE_VERBOSE))) {
- va_start(ap, fmt);
- vfprintf(nb_debug, fmt, ap);
- va_end(ap);
- fflush(nb_debug);
- }
-
-} /* end nbtrace */
-
-
void
nbdbg(
char *fmt,
@@ -136,23 +116,6 @@ nbdbg(
} /* end nbdbg */
-void
-nbprt(
- char *fmt,
- ...)
-{
- va_list ap;
-
- if (nb_debug != NULL && nb_dlevel & NB_PRINT) {
- va_start(ap, fmt);
- vfprintf(nb_debug, fmt, ap);
- va_end(ap);
- fflush(nb_debug);
- }
-
-} /* end nbprt */
-
-
static int
lookup(
char *file)
diff --git a/src/nbdebug.h b/src/nbdebug.h
index 65bb940b5..95109144c 100644
--- a/src/nbdebug.h
+++ b/src/nbdebug.h
@@ -43,8 +43,6 @@ typedef enum {
void nbdbg(char *, ...);
-void nbprt(char *, ...);
-void nbtrace(char *, ...);
void nbdebug_wait __ARGS((u_int wait_flags, char *wait_var, u_int wait_secs));
void nbdebug_log_init __ARGS((char *log_var, char *level_var));
@@ -70,19 +68,5 @@ nbdbg(
{
}
-void
-nbprt(
- char *fmt,
- ...)
-{
-}
-
-void
-nbtrace(
- char *fmt,
- ...)
-{
-}
-
#endif /* NBDEBUG */
#endif /* NBDEBUG_H */
diff --git a/src/version.c b/src/version.c
index 84c0f8295..7970cf205 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 115,
+/**/
114,
/**/
113,