Various smaller changes. Updated proto files. Updated dependencies.
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index bdae492..a49eae7 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -7166,6 +7166,8 @@
after recovery is compared to the original file contents. When they differ
the buffer is marked as modified.
+Use BASEMODLIBS instead of MODLIBS for Python configuration. (Michael Bienia)
+
Added *added-7.3*
-----
diff --git a/runtime/syntax/django.vim b/runtime/syntax/django.vim
index da35406..67c46b7 100644
--- a/runtime/syntax/django.vim
+++ b/runtime/syntax/django.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Django template
" Maintainer: Dave Hodder <dmh@dmh.org.uk>
-" Last Change: 2008 Dec 18
+" Last Change: 2010 May 19
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
@@ -18,9 +18,11 @@
" Django template built-in tags and parameters
" 'comment' doesn't appear here because it gets special treatment
-syn keyword djangoStatement contained autoescape on off endautoescape
+syn keyword djangoStatement contained autoescape csrf_token empty
+" FIXME ==, !=, <, >, <=, and >= should be djangoStatements:
+" syn keyword djangoStatement contained == != < > <= >=
syn keyword djangoStatement contained and as block endblock by cycle debug else
-syn keyword djangoStatement contained extends filter endfilter firstof for empty
+syn keyword djangoStatement contained extends filter endfilter firstof for
syn keyword djangoStatement contained endfor if endif ifchanged endifchanged
syn keyword djangoStatement contained ifequal endifequal ifnotequal
syn keyword djangoStatement contained endifnotequal in include load not now or
@@ -38,11 +40,11 @@
syn keyword djangoFilter contained default default_if_none dictsort
syn keyword djangoFilter contained dictsortreversed divisibleby escape escapejs
syn keyword djangoFilter contained filesizeformat first fix_ampersands
-syn keyword djangoFilter contained floatformat force_escape get_digit iriencode join last length length_is
+syn keyword djangoFilter contained floatformat get_digit join last length length_is
syn keyword djangoFilter contained linebreaks linebreaksbr linenumbers ljust
syn keyword djangoFilter contained lower make_list phone2numeric pluralize
-syn keyword djangoFilter contained pprint random removetags rjust safe slice slugify
-syn keyword djangoFilter contained stringformat striptags
+syn keyword djangoFilter contained pprint random removetags rjust slice slugify
+syn keyword djangoFilter contained safe safeseq stringformat striptags
syn keyword djangoFilter contained time timesince timeuntil title
syn keyword djangoFilter contained truncatewords truncatewords_html unordered_list upper urlencode
syn keyword djangoFilter contained urlize urlizetrunc wordcount wordwrap yesno
@@ -54,7 +56,7 @@
syn region djangoArgument contained start=/"/ skip=/\\"/ end=/"/
" Mark illegal characters within tag and variables blocks
-syn match djangoTagError contained "#}\|{{\|[^%]}}\|[<>!&#]"
+syn match djangoTagError contained "#}\|{{\|[^%]}}\|[&#]"
syn match djangoVarError contained "#}\|{%\|%}\|[<>!&#%]"
" Django template tag and variable blocks
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index f101e59..8a4e5ad 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -364,6 +364,9 @@
!if "$(_NMAKE_VER)" == "10.00.30128.01"
MSVCVER = 10.0
!endif
+!if "$(_NMAKE_VER)" == "10.00.30319.01"
+MSVCVER = 10.0
+!endif
!endif
# Abort bulding VIM if version of VC is unrecognised.
diff --git a/src/auto/configure b/src/auto/configure
index cc7d2a1..34de4f3 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -644,6 +644,7 @@
vi_cv_path_tcl
PYTHON_OBJ
PYTHON_SRC
+PYTHON_NOPROTO
PYTHON_CFLAGS
PYTHON_GETPATH_CFLAGS
PYTHON_LIBS
@@ -4903,7 +4904,7 @@
tmp_mkf="$pwd/config-PyMake$$"
cat -- "${PYTHON_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}"
__:
- @echo "python_MODLIBS='$(MODLIBS)'"
+ @echo "python_BASEMODLIBS='$(BASEMODLIBS)'"
@echo "python_LIBS='$(LIBS)'"
@echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
@@ -4919,7 +4920,7 @@
else
vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
fi
- vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
fi
@@ -4932,6 +4933,7 @@
else
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
fi
+ PYTHON_NOPROTO=
PYTHON_SRC="if_python.c"
if test "x$MACOSX" = "xyes"; then
PYTHON_OBJ="objects/if_python.o"
@@ -4943,7 +4945,7 @@
fi
PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
$as_echo_n "checking if -pthread should be used... " >&6; }
threadsafe_flag=
thread_lib=
@@ -4972,7 +4974,7 @@
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag"
+$as_echo "yes" >&6; }; PYTHON_NOPROTO="$threadsafe_flag"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }; LIBS=$libs_save_old
@@ -4990,7 +4992,7 @@
$as_echo_n "checking if compile and link flags for Python are sane... " >&6; }
cflags_save=$CFLAGS
libs_save=$LIBS
- CFLAGS="$CFLAGS $PYTHON_CFLAGS"
+ CFLAGS="$CFLAGS $PYTHON_CFLAGS $PYTHON_NOPROTO"
LIBS="$LIBS $PYTHON_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5023,6 +5025,7 @@
PYTHON_OBJ=
PYTHON_LIBS=
PYTHON_CFLAGS=
+ PYTHON_NOPROTO=
fi
fi
@@ -5039,6 +5042,7 @@
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-tclinterp argument" >&5
$as_echo_n "checking --enable-tclinterp argument... " >&6; }
# Check whether --enable-tclinterp was given.
diff --git a/src/config.mk.in b/src/config.mk.in
index f36e676..a950413 100644
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -56,6 +56,7 @@
PYTHON_SRC = @PYTHON_SRC@
PYTHON_OBJ = @PYTHON_OBJ@
PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON_NOPROTO = @PYTHON_NOPROTO@
PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_CONFDIR = @PYTHON_CONFDIR@
PYTHON_GETPATH_CFLAGS = @PYTHON_GETPATH_CFLAGS@
diff --git a/src/configure.in b/src/configure.in
index 0068d34..1d8cb09 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -725,7 +725,7 @@
tmp_mkf="$pwd/config-PyMake$$"
cat -- "${PYTHON_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}"
__:
- @echo "python_MODLIBS='$(MODLIBS)'"
+ @echo "python_BASEMODLIBS='$(BASEMODLIBS)'"
@echo "python_LIBS='$(LIBS)'"
@echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
@@ -742,7 +742,7 @@
else
vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
fi
- vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
dnl remove -ltermcap, it can conflict with an earlier -lncurses
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
fi
@@ -754,6 +754,7 @@
else
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
fi
+ PYTHON_NOPROTO=
PYTHON_SRC="if_python.c"
dnl For Mac OSX 10.2 config.o is included in the Python library.
if test "x$MACOSX" = "xyes"; then
@@ -773,6 +774,8 @@
dnl Otherwise, when using GCC, try adding -pthread to $CFLAGS. GCC
dnl will then define target-specific defines, e.g., -D_REENTRANT.
dnl Don't do this for Mac OSX, -pthread will generate a warning.
+ dnl Need to put -pthread in PYTHON_NOPROTO, because it cannot be used
+ dnl for cproto.
AC_MSG_CHECKING([if -pthread should be used])
threadsafe_flag=
thread_lib=
@@ -790,7 +793,7 @@
CFLAGS="$CFLAGS $threadsafe_flag"
LIBS="$LIBS $thread_lib"
AC_TRY_LINK(,[ ],
- AC_MSG_RESULT(yes); PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag",
+ AC_MSG_RESULT(yes); PYTHON_NOPROTO="$threadsafe_flag",
AC_MSG_RESULT(no); LIBS=$libs_save_old
)
CFLAGS=$cflags_save
@@ -803,7 +806,7 @@
AC_MSG_CHECKING([if compile and link flags for Python are sane])
cflags_save=$CFLAGS
libs_save=$LIBS
- CFLAGS="$CFLAGS $PYTHON_CFLAGS"
+ CFLAGS="$CFLAGS $PYTHON_CFLAGS $PYTHON_NOPROTO"
LIBS="$LIBS $PYTHON_LIBS"
AC_TRY_LINK(,[ ],
AC_MSG_RESULT(yes); python_ok=yes,
@@ -818,6 +821,7 @@
PYTHON_OBJ=
PYTHON_LIBS=
PYTHON_CFLAGS=
+ PYTHON_NOPROTO=
fi
fi
@@ -830,6 +834,7 @@
AC_SUBST(PYTHON_LIBS)
AC_SUBST(PYTHON_GETPATH_CFLAGS)
AC_SUBST(PYTHON_CFLAGS)
+AC_SUBST(PYTHON_NOPROTO)
AC_SUBST(PYTHON_SRC)
AC_SUBST(PYTHON_OBJ)
diff --git a/src/if_ruby.c b/src/if_ruby.c
index 2ee329b..8003d4c 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -170,7 +170,10 @@
#define rb_str_cat dll_rb_str_cat
#define rb_str_concat dll_rb_str_concat
#define rb_str_new dll_rb_str_new
-#define rb_str_new2 dll_rb_str_new2
+/* Ruby may also define rb_str_new2. */
+#ifndef rb_str_new2
+# define rb_str_new2 dll_rb_str_new2
+#endif
#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
# define rb_string_value_ptr dll_rb_string_value_ptr
# define rb_float_new dll_rb_float_new
diff --git a/src/main.aap b/src/main.aap
index b36fc36..e6ca2e0 100644
--- a/src/main.aap
+++ b/src/main.aap
@@ -290,6 +290,7 @@
# Some are optional and depend on configure.
# "version.c" is missing, it's always compiled (see below).
Source =
+ blowfish.c
buffer.c
charset.c
diff.c
@@ -328,6 +329,7 @@
regexp.c
screen.c
search.c
+ sha256.c
spell.c
syntax.c
tag.c
diff --git a/src/po/it.po b/src/po/it.po
index 54b7822..449085a 100644
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -12,8 +12,8 @@
msgid ""
msgstr ""
"Project-Id-Version: vim 7.2\n"
-"POT-Creation-Date: 2010-03-01 13:21+0100\n"
-"PO-Revision-Date: 2009-03-01 13:21+0100\n"
+"POT-Creation-Date: 2010-05-17 10:05+0200\n"
+"PO-Revision-Date: 2009-05-17 10:05+0200\n"
"Last-Translator: Vlad Sandrini <vlad.gently@gmail.com>\n"
"Language-Team: Italian"
" Antonio Colombo <azc100@gmail.com>"
@@ -1266,6 +1266,9 @@
msgstr ""
"E467: Il completamento personalizzato richiede un argomento di funzione"
+msgid "unknown"
+msgstr "sconosciuto"
+
#, c-format
msgid "E185: Cannot find color scheme %s"
msgstr "E185: Non riesco a trovare schema colore %s"
@@ -2428,13 +2431,13 @@
msgstr "E567: nessuna connessione cscope"
#, c-format
-msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: nessuna corrispondenza trovata per la richiesta cscope %s di %s"
-
-#, c-format
msgid "E469: invalid cscopequickfix flag %c for %c"
msgstr "E469: flag cscopequickfix %c non valido per %c"
+#, c-format
+msgid "E259: no matches found for cscope query %s of %s"
+msgstr "E259: nessuna corrispondenza trovata per la richiesta cscope %s di %s"
+
msgid "cscope commands:\n"
msgstr "comandi cscope:\n"
diff --git a/src/proto/ex_getln.pro b/src/proto/ex_getln.pro
index 2750542..cdc49a8 100644
--- a/src/proto/ex_getln.pro
+++ b/src/proto/ex_getln.pro
@@ -5,8 +5,8 @@
void text_locked_msg __ARGS((void));
int curbuf_locked __ARGS((void));
int allbuf_locked __ARGS((void));
-char_u *getexline __ARGS((int c, void *dummy, int indent));
-char_u *getexmodeline __ARGS((int promptc, void *dummy, int indent));
+char_u *getexline __ARGS((int c, void *cookie, int indent));
+char_u *getexmodeline __ARGS((int promptc, void *cookie, int indent));
int cmdline_overstrike __ARGS((void));
int cmdline_at_end __ARGS((void));
colnr_T cmdline_getvcol_cursor __ARGS((void));
diff --git a/src/proto/ui.pro b/src/proto/ui.pro
index 2bc0c31..87cee8b 100644
--- a/src/proto/ui.pro
+++ b/src/proto/ui.pro
@@ -48,10 +48,10 @@
void open_app_context __ARGS((void));
void x11_setup_atoms __ARGS((Display *dpy));
void clip_x11_request_selection __ARGS((Widget myShell, Display *dpy, VimClipboard *cbd));
-void yank_cut_buffer0 __ARGS((Display *dpy, VimClipboard *cbd));
void clip_x11_lose_selection __ARGS((Widget myShell, VimClipboard *cbd));
int clip_x11_own_selection __ARGS((Widget myShell, VimClipboard *cbd));
void clip_x11_set_selection __ARGS((VimClipboard *cbd));
+void yank_cut_buffer0 __ARGS((Display *dpy, VimClipboard *cbd));
int jump_to_mouse __ARGS((int flags, int *inclusive, int which_button));
int mouse_comp_pos __ARGS((win_T *win, int *rowp, int *colp, linenr_T *lnump));
win_T *mouse_find_win __ARGS((int *rowp, int *colp));