[SCM] Vim packaging branch, master, updated. debian/7.1.293-3-59-g62b3d44
James Vega
jamessan at debian.org
Sat Jun 14 17:15:11 UTC 2008
The following commit has been merged in the master branch:
commit 603583c20bc75476cbc143e3d64d4b04412564d0
Merge: d4a8be678f00018c7296dc6d17de330a8bd59ef9 84fd55dd153e2b10b1229552b1c34a40d26c7664
Author: James Vega <jamessan at debian.org>
Date: Sat Jun 14 12:06:05 2008 -0400
Merge branch 'deb/runtime'
Conflicts:
src/fileio.c
src/os_unix.c
Signed-off-by: James Vega <jamessan at debian.org>
diff --combined src/Makefile
index b1947cb,f82e7c7..b77d44c
--- a/src/Makefile
+++ b/src/Makefile
@@@ -780,6 -780,8 +780,8 @@@ LINT_OPTIONS = -beprxz
# 1) make config
# 2) edit auto/config.mk, add -n32 to LDFLAGS
# 3) make
+ #
+ #Alternatively: use -o32 instead of -n32.
###
### (C) On SCO Unix v3.2.5 (and probably other versions) the termcap library,
@@@ -1074,7 -1076,7 +1076,7 @@@ PRINTSOURCE = ../runtime/prin
# default vi editor, it will create a link from vi to Vim when doing
# "make install". An existing file will be overwritten!
# When not using it, some make programs can't handle an undefined $(LINKIT).
- #LINKIT = -ln -f -s $(BINDIR)/$(VIMTARGET) /usr/bin/vi
+ #LINKIT = ln -f -s $(DEST_BIN)/$(VIMTARGET) $(DESTDIR)/usr/bin/vi
LINKIT = @echo >/dev/null
###
@@@ -1290,6 -1292,9 +1292,9 @@@ LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPU
DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS)
+ # If you have problems with flags that cproto doesn't support, and you are
+ # using GNU make, you can try using the other line to filter out arguments.
+ #PFLAGS = $(PROTO_FLAGS) -DPROTO $(filter -D% -I%, $(LINT_CFLAGS))
PFLAGS = $(PROTO_FLAGS) -DPROTO $(LINT_CFLAGS)
ALL_LIB_DIRS = $(GUI_LIBS_DIR) $(X_LIBS_DIR)
@@@ -1758,6 -1763,7 +1763,6 @@@ installvimbin: $(VIMTARGET) $(DESTDIR)$
rm -f $(DEST_BIN)/$(VIMNAME).rm; \
fi
$(INSTALL_PROG) $(VIMTARGET) $(DEST_BIN)
- $(STRIP) $(DEST_BIN)/$(VIMTARGET)
chmod $(BINMOD) $(DEST_BIN)/$(VIMTARGET)
# may create a link to the new executable from /usr/bin/vi
-$(LINKIT)
@@@ -1866,6 -1872,8 +1871,8 @@@ installmacros: $(DEST_VIM) $(DEST_RT) $
installtutorbin: $(DEST_VIM)
$(INSTALL_DATA) vimtutor $(DEST_BIN)/$(VIMNAME)tutor
chmod $(SCRIPTMOD) $(DEST_BIN)/$(VIMNAME)tutor
+ $(INSTALL_DATA) gvimtutor $(DEST_BIN)/$(GVIMNAME)tutor
+ chmod $(SCRIPTMOD) $(DEST_BIN)/$(GVIMNAME)tutor
installtutor: $(DEST_RT) $(DEST_TUTOR)
-$(INSTALL_DATA) $(TUTORSOURCE)/README* $(TUTORSOURCE)/tutor* $(DEST_TUTOR)
@@@ -1888,6 -1896,7 +1895,6 @@@ installtools: $(TOOLS) $(DESTDIR)$(exec
rm -f $(DEST_BIN)/xxd.rm; \
fi
$(INSTALL_PROG) xxd/xxd$(EXEEXT) $(DEST_BIN)
- $(STRIP) $(DEST_BIN)/xxd$(EXEEXT)
chmod $(BINMOD) $(DEST_BIN)/xxd$(EXEEXT)
-$(SHELL) ./installman.sh xxd $(DEST_MAN) "" $(INSTALLMANARGS)
@@@ -2073,6 -2082,7 +2080,7 @@@ installmanlinks
uninstall: uninstall_runtime
-rm -f $(DEST_BIN)/$(VIMTARGET)
-rm -f $(DEST_BIN)/vimtutor
+ -rm -f $(DEST_BIN)/gvimtutor
-rm -f $(DEST_BIN)/$(EXTARGET) $(DEST_BIN)/$(VIEWTARGET)
-rm -f $(DEST_BIN)/$(GVIMTARGET) $(DEST_BIN)/$(GVIEWTARGET)
-rm -f $(DEST_BIN)/$(RVIMTARGET) $(DEST_BIN)/$(RVIEWTARGET)
@@@ -2169,7 -2179,7 +2177,7 @@@ SHADOWDIR = shado
shadow: runtime pixmaps
mkdir $(SHADOWDIR)
- cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../mkinstalldirs .
+ cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../po ../vimtutor ../gvimtutor ../mkinstalldirs .
mkdir $(SHADOWDIR)/auto
cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
cd $(SHADOWDIR); rm -f auto/link.sed
@@@ -2188,7 -2198,7 +2196,7 @@@
cd $(SHADOWDIR)/testdir; ln -s ../../testdir/Makefile \
../../testdir/vimrc.unix \
../../testdir/*.in \
- ../../testdir/unix.vim \
+ ../../testdir/*.vim \
../../testdir/*.ok .
# Link needed for doing "make install" in a shadow directory.
diff --combined src/configure.in
index bcd610f,628c2c3..a025f72
--- a/src/configure.in
+++ b/src/configure.in
@@@ -299,22 -299,20 +299,35 @@@ case `uname` i
esac
fi
+ dnl Link with -lselinux for SELinux stuff; if not found
+ AC_MSG_CHECKING(--disable-selinux argument)
+ AC_ARG_ENABLE(selinux,
+ [ --disable-selinux Don't check for SELinux support.],
+ , enable_selinux="yes")
+ if test "$enable_selinux" = "yes"; then
+ AC_MSG_RESULT(no)
+ AC_CHECK_LIB(selinux, is_selinux_enabled,
+ [LIBS="$LIBS -lselinux"
+ AC_DEFINE(HAVE_SELINUX)])
+ else
+ AC_MSG_RESULT(yes)
+ fi
+dnl vim: set sw=2 tw=78 fo+=l:
+dnl Link with -lselinux for SELinux stuff; if not found
+AC_MSG_CHECKING(--disable-selinux argument)
+AC_ARG_ENABLE(selinux,
+ [ --disable-selinux Don't check for SELinux support.],
+ , [enable_selinux="yes"])
+if test "$enable_selinux" = "yes"; then
+ AC_MSG_RESULT(no)
+ AC_CHECK_LIB(selinux, is_selinux_enabled,
+ [LIBS="$LIBS -lselinux"
+ AC_DEFINE(HAVE_SELINUX)])
+else
+ AC_MSG_RESULT(yes)
+fi
+
dnl Check user requested features.
AC_MSG_CHECKING(--with-features argument)
diff --combined src/option.c
index b2ee293,885c547..9ea57d6
--- a/src/option.c
+++ b/src/option.c
@@@ -243,7 -243,8 +243,8 @@@
/* WV_ and BV_ values get typecasted to this for the "indir" field */
typedef enum
{
- PV_NONE = 0
+ PV_NONE = 0,
+ PV_MAXVAL = 0xffff /* to avoid warnings for value out of range */
} idopt_T;
/*
@@@ -8713,7 -8714,7 +8714,7 @@@ put_setstring(fd, cmd, name, valuep, ex
{
s = *valuep;
while (*s != NUL)
- if (fputs((char *)str2special(&s, FALSE), fd) < 0)
+ if (put_escstr(fd, str2special(&s, FALSE), 2) == FAIL)
return FAIL;
}
else if (expand)
@@@ -10135,7 -10136,7 +10136,7 @@@ langmap_set(
{
char_u *p;
char_u *p2;
- int from, to;
+ int from=NUL, to=NUL;
langmap_init(); /* back to one-to-one map first */
@@@ -10153,11 -10154,6 +10154,11 @@@
p2 = NULL; /* aAbBcCdD form, p2 is NULL */
while (p[0])
{
+ if (p[0] == ',')
+ {
+ ++p;
+ break;
+ }
if (p[0] == '\\' && p[1] != NUL)
++p;
#ifdef FEAT_MBYTE
@@@ -10168,29 -10164,23 +10169,29 @@@
if (p2 == NULL)
{
mb_ptr_adv(p);
- if (p[0] == '\\')
- ++p;
+ if (p[0] != ',')
+ {
+ if (p[0] == '\\')
+ ++p;
#ifdef FEAT_MBYTE
- to = (*mb_ptr2char)(p);
+ to = (*mb_ptr2char)(p);
#else
- to = p[0];
+ to = p[0];
#endif
+ }
}
else
{
- if (p2[0] == '\\')
- ++p2;
+ if (p2[0] != ',')
+ {
+ if (p2[0] == '\\')
+ ++p2;
#ifdef FEAT_MBYTE
- to = (*mb_ptr2char)(p2);
+ to = (*mb_ptr2char)(p2);
#else
- to = p2[0];
+ to = p2[0];
#endif
+ }
}
if (to == NUL)
{
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list