summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-02-13 09:28:19 +0000
committerBram Moolenaar <Bram@vim.org>2008-02-13 09:28:19 +0000
commit8b131505eb9b96e5a670a24fdd7db00b84fb26b7 (patch)
tree8666933e4c3d086cef95fc914478b92c68ab85a9 /src
parentae0f2caeb3a493f18495b95977dbec171af55fcf (diff)
updated for version 7.1-246v7.1.246
Diffstat (limited to 'src')
-rwxr-xr-xsrc/auto/configure2
-rw-r--r--src/configure.in2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure
index aa58dfa134..a3ccfd790b 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14259,7 +14259,7 @@ echo "${ECHO_T}$TAGPRG" >&6
echo "$as_me:$LINENO: checking how to run man with a section nr" >&5
echo $ECHO_N "checking how to run man with a section nr... $ECHO_C" >&6
MANDEF="man"
-(eval man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s"
+(eval MANPAGER=cat PAGER=cat man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s"
echo "$as_me:$LINENO: result: $MANDEF" >&5
echo "${ECHO_T}$MANDEF" >&6
if test "$MANDEF" = "man -s"; then
diff --git a/src/configure.in b/src/configure.in
index 5c8693b24b..c77598523d 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -2726,7 +2726,7 @@ AC_MSG_RESULT($TAGPRG) AC_SUBST(TAGPRG)
dnl Check how we can run man with a section number
AC_MSG_CHECKING(how to run man with a section nr)
MANDEF="man"
-(eval man -s 2 read) < /dev/null > /dev/null 2>&AC_FD_CC && MANDEF="man -s"
+(eval MANPAGER=cat PAGER=cat man -s 2 read) < /dev/null > /dev/null 2>&AC_FD_CC && MANDEF="man -s"
AC_MSG_RESULT($MANDEF)
if test "$MANDEF" = "man -s"; then
AC_DEFINE(USEMAN_S)
diff --git a/src/version.c b/src/version.c
index 30e6f84254..b72eb2a768 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 246,
+/**/
245,
/**/
244,