aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00
Code

Various smaller changes. Updated proto files. Updated dependencies.

Browse Source
This commit is contained in:
Bram Moolenaar 2010-05-20 21:46:00 +02:00
parent fa7584cb86
commit 218116c1d0
11 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/version7.txt
View File

@ -7166,6 +7166,8 @@ don't save what you see. This could result in work being lost. Now the text
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*
-----

16
runtime/syntax/django.vim
View File

@ -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 @@ syn match djangoError "%}\|}}\|#}"
" 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 add addslashes capfirst center cut date
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 keyword djangoTodo contained TODO FIXME XXX
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

3
src/Make_mvc.mak
View File

@ -364,6 +364,9 @@ MSVCVER = 10.0
!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.

14
src/auto/configure vendored
View File

@ -644,6 +644,7 @@ TCL_SRC
vi_cv_path_tcl
PYTHON_OBJ
PYTHON_SRC
PYTHON_NOPROTO
PYTHON_CFLAGS
PYTHON_GETPATH_CFLAGS
PYTHON_LIBS
@ -4903,7 +4904,7 @@ else
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 @@ eof
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 @@ fi
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
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 @@ main ()
_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 "no" >&6; }
$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 @@ rm -f core conftest.err conftest.$ac_objext \
PYTHON_OBJ=
PYTHON_LIBS=
PYTHON_CFLAGS=
PYTHON_NOPROTO=
fi
fi
@ -5039,6 +5042,7 @@ fi
{ $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.

1
src/config.mk.in
View File

@ -56,6 +56,7 @@ PERL_CFLAGS = @PERL_CFLAGS@
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@

13
src/configure.in
View File

@ -725,7 +725,7 @@ if test "$enable_pythoninterp" = "yes"; then
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 @@ eof
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 @@ eof
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 @@ eof
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 @@ eof
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 @@ eof
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 @@ eof
PYTHON_OBJ=
PYTHON_LIBS=
PYTHON_CFLAGS=
PYTHON_NOPROTO=
fi
fi
@ -830,6 +834,7 @@ AC_SUBST(PYTHON_CONFDIR)
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)

5
src/if_ruby.c
View File

@ -170,7 +170,10 @@ static void ruby_vim_init(void);
#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

2
src/main.aap
View File

@ -290,6 +290,7 @@ testclean {virtual}:
# 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 @@ Source =
regexp.c
screen.c
search.c
sha256.c
spell.c
syntax.c
tag.c

15
src/po/it.po
View File

@ -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 @@ msgid "E467: Custom completion requires a function argument"
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"
@ -2427,14 +2430,14 @@ msgstr "E623: Non riesco a generare processo cscope"
msgid "E567: no cscope connections"
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"

4
src/proto/ex_getln.pro
View File

@ -5,8 +5,8 @@ int text_locked __ARGS((void));
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));

2
src/proto/ui.pro
View File

@ -48,10 +48,10 @@ int check_row __ARGS((int row));
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));