0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

updated for version 7.0044

This commit is contained in:
Bram Moolenaar 2005-01-25 21:57:23 +00:00
parent 281bdcec60
commit 9d75c83f8f
8 changed files with 33 additions and 14 deletions

View File

@ -1,4 +1,4 @@
*usr_41.txt* For Vim version 7.0aa. Last change: 2005 Jan 17
*usr_41.txt* For Vim version 7.0aa. Last change: 2005 Jan 25
VIM USER MANUAL - by Bram Moolenaar
@ -27,7 +27,7 @@ script. There are a lot of them, thus this is a long chapter.
Table of contents: |usr_toc.txt|
==============================================================================
*41.1* Introduction *vim-script-intro*
*41.1* Introduction *vim-script-intro* *script*
Your first experience with Vim scripts is the vimrc file. Vim reads it when
it starts up and executes the commands. You can set options to values you

View File

@ -1509,12 +1509,20 @@ reconfig: scratch clean
# - Temporarily move the ./configure script to ./configure.save. Don't
# overwrite it, it's probably the result of an aborted autoconf.
# - Use sed to change ./config.log to auto/config.log in the configure script.
# Autoconf 2.5x (2.59 at least) produces a few more files that we need to take
# care of:
# - configure.lineno: has the line numbers replaced with $LINENO. That
# improves patches a LOT, thus use it instead (until someone says it doesn't
# work on some system).
# - autom4te.cache directory is created and not cleaned up. Delete it.
# - Uses ">config.log" instead of "./config.log".
autoconf:
if test ! -f configure.save; then mv configure configure.save; fi
autoconf
sed -e 's+\./config.log+auto/config.log+' configure > auto/configure
sed -e 's+>config.log+>auto/config.log+' -e 's+\./config.log+auto/config.log+' configure > auto/configure
chmod 755 auto/configure
mv -f configure.save configure
-rm -rf autom4te.cache
-rm -f auto/config.status auto/config.cache
# Re-execute this Makefile to include the new auto/config.mk produced by
@ -2063,12 +2071,15 @@ depend:
sed -e 's+^\([^ ]*\.o\)+objects/\1+' >> tmp_make; done
mv tmp_make Makefile
# Run lint. Clean up the *.ln files that are sometimes left behind.
lint:
lint $(LINT_OPTIONS) $(LINT_CFLAGS) -DUSE_SNIFF -DHANGUL_INPUT $(LINT_SRC)
-rm -f *.ln
# Check dosinst.c with lint.
lintinstall:
lint $(LINT_OPTIONS) -DWIN32 -DUNIX_LINT dosinst.c
-rm -f dosinst.ln
###########################################################################

View File

@ -116,6 +116,7 @@ gtk_form_put(GtkForm *form,
g_return_if_fail(GTK_IS_FORM(form));
/* LINTED: avoid warning: conversion to 'unsigned long' */
child = g_new(GtkFormChild, 1);
child->widget = child_widget;

View File

@ -346,8 +346,8 @@ set_pixmap(XmEnhancedButtonWidget eb)
XGetGeometry(dpy, pix, &root, &x, &y, &width, &height, &border, &depth);
if (eb->enhancedbutton.label_location == XmTOP
|| eb->enhancedbutton.label_location == XmBOTTOM)
if (eb->enhancedbutton.label_location == (int)XmTOP
|| eb->enhancedbutton.label_location == (int)XmBOTTOM)
shift = eb->primitive.shadow_thickness / 2;
else
shift = eb->primitive.shadow_thickness / 2;

View File

@ -464,7 +464,9 @@ new ## TNAME ## rv(rv, ptr) \
return sv_bless(rv, gv_stashpv("VI" #TNAME, TRUE)); \
}
/* LINTED: avoid warning: cast from pointer to integer of different size */
newANYrv(win_T, WIN)
/* LINTED: avoid warning: cast from pointer to integer of different size */
newANYrv(buf_T, BUF)
/*
@ -684,8 +686,8 @@ ex_perldo(eap)
{
dSP;
length = strlen((char *)eap->arg);
sv = newSV(length + sizeof("sub VIM::perldo {")-1 + 1);
sv_setpvn(sv, "sub VIM::perldo {", sizeof("sub VIM::perldo {")-1);
sv = newSV(length + sizeof("sub VIM::perldo {") - 1 + 1);
sv_setpvn(sv, "sub VIM::perldo {", sizeof("sub VIM::perldo {") - 1);
sv_catpvn(sv, (char *)eap->arg, length);
sv_catpvn(sv, "}", 1);
perl_eval_sv(sv, G_DISCARD | G_NOARGS);
@ -701,7 +703,7 @@ ex_perldo(eap)
SAVETMPS;
for (i = eap->line1; i <= eap->line2; i++)
{
sv_setpv(GvSV(PL_defgv),(char *)ml_get(i));
sv_setpv(GvSV(PL_defgv), (char *)ml_get(i));
PUSHMARK(sp);
perl_call_pv("VIM::perldo", G_SCALAR | G_EVAL);
str = SvPV(GvSV(PL_errgv), length);

View File

@ -5430,11 +5430,13 @@ xim_get_status_area_height()
#ifdef FEAT_GUI_GTK
if (xim_input_style & (int)GDK_IM_STATUS_AREA)
return gui.char_height;
#elif defined FEAT_GUI_KDE
/* always return zero? */
#else
# if defined FEAT_GUI_KDE
/* always return zero? */
# else
if (status_area_enabled)
return gui.char_height;
# endif
#endif
return 0;
}

View File

@ -1767,9 +1767,10 @@ set_x11_title(title)
NULL, NULL, 0, NULL, NULL, NULL);
# else
XTextProperty text_prop;
char *c_title = (char *)title;
/* directly from example 3-18 "basicwin" of Xlib Programming Manual */
(void)XStringListToTextProperty((char **)&title, 1, &text_prop);
(void)XStringListToTextProperty(&c_title, 1, &text_prop);
XSetWMProperties(x11_display, x11_window, &text_prop,
NULL, NULL, 0, NULL, NULL, NULL);
# endif
@ -1803,8 +1804,9 @@ set_x11_icon(icon)
NULL, 0, NULL, NULL, NULL);
# else
XTextProperty text_prop;
char *c_icon = (char *)icon;
(void)XStringListToTextProperty((char **)&icon, 1, &text_prop);
(void)XStringListToTextProperty(&c_icon, 1, &text_prop);
XSetWMProperties(x11_display, x11_window, NULL, &text_prop,
NULL, 0, NULL, NULL, NULL);
# endif
@ -4001,6 +4003,7 @@ finished:
if (WIFEXITED(status))
{
/* LINTED avoid "bitwise operation on signed value" */
retval = WEXITSTATUS(status);
if (retval && !emsg_silent)
{

View File

@ -617,9 +617,9 @@ restofline:
if (qf_add_entry(&qfprev,
directory,
*namebuf || directory
(*namebuf || directory)
? namebuf
: currfile && valid ? currfile : NULL,
: ((currfile && valid) ? currfile : (char_u *)NULL),
errmsg,
lnum,
col,