Permalink
Browse files

updated for version 7.0073

  • Loading branch information...
1 parent 058c721 commit 3177219fa495acd91d3bcbafcb804dd7f266c24b vimboss committed May 19, 2005
Showing with 121 additions and 135 deletions.
  1. +4 −1 runtime/doc/if_mzsch.txt
  2. +3 −1 runtime/doc/tags
  3. +8 −4 src/Makefile
  4. +2 −0 src/charset.c
  5. +0 −4 src/config.h.in
  6. +1 −25 src/configure.in
  7. +14 −12 src/ex_eval.c
  8. +2 −2 src/fileio.c
  9. +1 −1 src/gui.c
  10. +1 −1 src/gui_mac.c
  11. +1 −2 src/gui_riscos.c
  12. +8 −8 src/gui_xmdlg.c
  13. +1 −1 src/if_cscope.c
  14. +9 −3 src/mbyte.c
  15. +7 −27 src/misc2.c
  16. +3 −2 src/os_mswin.c
  17. +5 −3 src/os_unix.c
  18. +2 −1 src/os_vms_mms.c
  19. +0 −1 src/os_win32.h
  20. +2 −1 src/quickfix.c
  21. +4 −4 src/tag.c
  22. +2 −2 src/version.h
  23. +38 −27 src/workshop.c
  24. +3 −2 src/wsdebug.c
View
@@ -1,4 +1,4 @@
-*if_mzsch.txt* For Vim version 7.0aa. Last change: 2005 Jan 23
+*if_mzsch.txt* For Vim version 7.0aa. Last change: 2005 May 08
VIM REFERENCE MANUAL by Sergey Khorev
@@ -110,6 +110,9 @@ something like this in your .vimrc (EOFs should not have indentation): >
<
The global namespace just instantiated this module with the prefix "vimext:".
+ *mzscheme-sandbox*
+When executed in the |sandbox|, access to some filesystem and Vim interface
+procedures is restricted.
==============================================================================
2. Examples *mzscheme-examples*
View
@@ -5117,7 +5117,6 @@ hebrew hebrew.txt /*hebrew*
hebrew.txt hebrew.txt /*hebrew.txt*
help various.txt /*help*
help-context help.txt /*help-context*
-help-tags tags 1
help-translated various.txt /*help-translated*
help-xterm-window various.txt /*help-xterm-window*
help.txt help.txt /*help.txt*
@@ -5550,6 +5549,7 @@ matchend() eval.txt /*matchend()*
matchit-install usr_05.txt /*matchit-install*
matchlist() eval.txt /*matchlist()*
matchstr() eval.txt /*matchstr()*
+mathematica-syntax syntax.txt /*mathematica-syntax*
max() eval.txt /*max()*
mbyte-IME mbyte.txt /*mbyte-IME*
mbyte-XIM mbyte.txt /*mbyte-XIM*
@@ -5579,6 +5579,8 @@ minimal-features os_msdos.txt /*minimal-features*
missing-options vi_diff.txt /*missing-options*
mkdir() eval.txt /*mkdir()*
mlang.txt mlang.txt /*mlang.txt*
+mma-syntax syntax.txt /*mma-syntax*
+mma.vim syntax.txt /*mma.vim*
mode() eval.txt /*mode()*
mode-Ex intro.txt /*mode-Ex*
mode-cmdline cmdline.txt /*mode-cmdline*
View
@@ -1225,8 +1225,10 @@ CPP_DEPEND = $(CC) -I$(srcdir) -M$(CPP_MM) $(DEPEND_CFLAGS)
# flags for cproto
# This is for cproto 3 patchlevel 8 or below
# __inline, __attribute__ and __extension__ are not recognized by cproto
-NO_ATTR = -D__inline= -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" -D__extension__= \
--D__restrict="" -D__gnuc_va_list=char -D__builtin_va_list=char
+NO_ATTR = -D__inline= -D__inline__= -DG_IMPLEMENT_INLINES \
+ -D"__attribute__\\(x\\)=" -D"__asm__\\(x\\)=" \
+ -D__extension__= -D__restrict="" \
+ -D__gnuc_va_list=char -D__builtin_va_list=char
#
# This is for cproto 3 patchlevel 9 or above (currently 4.6)
@@ -1259,7 +1261,9 @@ POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(TCL
ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(POST_DEFS)
-LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) -Dinline= -D__extension__= -Dalloca=alloca -D"__attribute__(x)="
+LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) -Dinline= -D__extension__= -Dalloca=alloca
+
+LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)="
DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS)
@@ -2172,7 +2176,7 @@ depend:
# Run lint. Clean up the *.ln files that are sometimes left behind.
lint:
- lint $(LINT_OPTIONS) $(LINT_CFLAGS) -DUSE_SNIFF -DHANGUL_INPUT $(LINT_SRC)
+ lint $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC)
-rm -f *.ln
# Check dosinst.c with lint.
View
@@ -1005,6 +1005,7 @@ init_spell_chartab()
}
}
+#if defined(FEAT_MBYTE) || defined(PROTO)
static char *e_affform = N_("E761: Format error in affix file FOL, LOW or UPP");
static char *e_affrange = N_("E762: Character in FOL, LOW or UPP is out of range");
@@ -1083,6 +1084,7 @@ set_spell_chartab(fol, low, upp)
return set_spell_finish(&new_st);
}
+#endif
/*
* Set the spell character tables from strings in the .spl file.
View
@@ -164,7 +164,6 @@
#undef HAVE_SIGSETJMP
#undef HAVE_SIGSTACK
#undef HAVE_SIGVEC
-#undef HAVE_SNPRINTF
#undef HAVE_STRCASECMP
#undef HAVE_STRERROR
#undef HAVE_STRFTIME
@@ -368,6 +367,3 @@
/* Define if you want XSMP interaction as well as vanilla swapfile safety */
#undef USE_XSMP_INTERACT
-
-/* Define if vsnprintf() works */
-#undef HAVE_VSNPRINTF
View
@@ -2636,7 +2636,7 @@ AC_CHECK_FUNCS(bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \
getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
memset nanosleep opendir putenv qsort readlink select setenv \
setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
- sigvec snprintf strcasecmp strerror strftime stricmp strncasecmp \
+ sigvec strcasecmp strerror strftime stricmp strncasecmp \
strnicmp strpbrk strtol tgetent towlower towupper iswupper \
usleep utime utimes)
@@ -2777,30 +2777,6 @@ else
AC_MSG_RESULT(yes)
fi
-AC_MSG_CHECKING(for vsnprintf())
-AC_TRY_RUN([
-#include <stdio.h>
-#include <stdarg.h>
- /* Check use of vsnprintf() */
- void warn(char *fmt, ...);
- void warn(char *fmt, ...)
- {
- va_list ap; char buf[20];
- va_start(ap, fmt);
- vsnprintf(buf, 20, fmt, ap);
- va_end(ap);
- }
- main()
- {
- warn("testing %s\n", "a very long string that won't fit");
- exit(0);
- }
- ],
- AC_DEFINE(HAVE_VSNPRINTF) AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no),
- AC_MSG_ERROR(failed to compile test program))
-
-
dnl rename needs to be checked separately to work on Nextstep with cc
AC_MSG_CHECKING(for rename)
AC_TRY_LINK([#include <stdio.h>], [rename("this", "that")],
View
@@ -484,8 +484,8 @@ throw_exception(value, type, cmdname)
|| (VIM_ISDIGIT(p[3])
&& p[4] == ':'))))))
{
- if (*p == NUL || p == mesg) /* 'E123' missing or at beginning */
- STRCAT(val, mesg);
+ if (*p == NUL || p == mesg)
+ STRCAT(val, mesg); /* 'E123' missing or at beginning */
else
{
/* '"filename" E123: message text' */
@@ -525,7 +525,7 @@ throw_exception(value, type, cmdname)
msg_silent = FALSE; /* display messages */
++no_wait_return;
msg_scroll = TRUE; /* always scroll up, don't overwrite */
- msg_str((char_u *)_("Exception thrown: %s"), excp->value);
+ smsg((char_u *)_("Exception thrown: %s"), excp->value);
msg_puts((char_u *)"\n"); /* don't overwrite this either */
cmdline_row = msg_row;
--no_wait_return;
@@ -571,7 +571,7 @@ discard_exception(excp, was_finished)
msg_silent = FALSE; /* display messages */
++no_wait_return;
msg_scroll = TRUE; /* always scroll up, don't overwrite */
- msg_str(was_finished
+ smsg(was_finished
? (char_u *)_("Exception finished: %s")
: (char_u *)_("Exception discarded: %s"),
excp->value);
@@ -616,10 +616,10 @@ catch_exception(excp)
if (*excp->throw_name != NUL)
{
if (excp->throw_lnum != 0)
- sprintf((char *)IObuff, _("%s, line %ld"), excp->throw_name,
- (long)excp->throw_lnum);
+ vim_snprintf((char *)IObuff, IOSIZE, _("%s, line %ld"),
+ excp->throw_name, (long)excp->throw_lnum);
else
- STRCPY(IObuff, excp->throw_name);
+ vim_snprintf((char *)IObuff, IOSIZE, "%s", excp->throw_name);
set_vim_var_string(VV_THROWPOINT, IObuff, -1);
}
else
@@ -634,7 +634,7 @@ catch_exception(excp)
msg_silent = FALSE; /* display messages */
++no_wait_return;
msg_scroll = TRUE; /* always scroll up, don't overwrite */
- msg_str((char_u *)_("Exception caught: %s"), excp->value);
+ smsg((char_u *)_("Exception caught: %s"), excp->value);
msg_puts((char_u *)"\n"); /* don't overwrite this either */
cmdline_row = msg_row;
--no_wait_return;
@@ -659,11 +659,12 @@ finish_exception(excp)
if (*caught_stack->throw_name != NUL)
{
if (caught_stack->throw_lnum != 0)
- sprintf((char *)IObuff,
+ vim_snprintf((char *)IObuff, IOSIZE,
_("%s, line %ld"), caught_stack->throw_name,
(long)caught_stack->throw_lnum);
else
- STRCPY(IObuff, caught_stack->throw_name);
+ vim_snprintf((char *)IObuff, IOSIZE, "%s",
+ caught_stack->throw_name);
set_vim_var_string(VV_THROWPOINT, IObuff, -1);
}
else
@@ -742,7 +743,8 @@ report_pending(action, pending, value)
default:
if (pending & CSTP_THROW)
{
- sprintf((char *)IObuff, (char *)mesg, _("Exception"));
+ vim_snprintf((char *)IObuff, IOSIZE,
+ (char *)mesg, _("Exception"));
mesg = vim_strnsave(IObuff, (int)STRLEN(IObuff) + 4);
STRCAT(mesg, ": %s");
s = (char *)((except_T *)value)->value;
@@ -760,7 +762,7 @@ report_pending(action, pending, value)
msg_silent = FALSE; /* display messages */
++no_wait_return;
msg_scroll = TRUE; /* always scroll up, don't overwrite */
- msg_str(mesg, (char_u *)s);
+ smsg(mesg, (char_u *)s);
msg_puts((char_u *)"\n"); /* don't overwrite this either */
cmdline_row = msg_row;
--no_wait_return;
View
@@ -8342,7 +8342,7 @@ auto_next_pat(apc, stop_at_last)
sprintf((char *)sourcing_name, s,
(char *)name, (char *)ap->pat);
if (p_verbose >= 8)
- msg_str((char_u *)_("Executing %s"), sourcing_name);
+ smsg((char_u *)_("Executing %s"), sourcing_name);
}
apc->curpat = ap;
@@ -8410,7 +8410,7 @@ getnextac(c, cookie, indent)
if (p_verbose >= 9)
{
msg_scroll = TRUE; /* always scroll up, don't overwrite */
- msg_str((char_u *)_("autocommand %s"), ac->cmd);
+ smsg((char_u *)_("autocommand %s"), ac->cmd);
msg_puts((char_u *)"\n"); /* don't overwrite this either */
cmdline_row = msg_row;
}
View
@@ -4359,7 +4359,7 @@ gui_find_bitmap(name, buffer, ext)
{
if (STRLEN(name) > MAXPATHL - 14)
return FAIL;
- sprintf((char *)buffer, "bitmaps/%s.%s", name, ext);
+ vim_snprintf((char *)buffer, MAXPATHL, "bitmaps/%s.%s", name, ext);
if (do_in_runtimepath(buffer, FALSE, gfp_setname, buffer) == FAIL
|| *buffer == NUL)
return FAIL;
View
@@ -1644,7 +1644,7 @@ GetFontPanelSelection(char_u* outName)
/* Only encode font size, because style (bold, italic, etc) is
* already part of the font full name */
- snprintf(styleString, FONT_STYLE_BUFFER_SIZE, ":h%d",
+ vim_snprintf(styleString, FONT_STYLE_BUFFER_SIZE, ":h%d",
gFontPanelInfo.size/*,
((gFontPanelInfo.style & bold)!=0 ? ":b" : ""),
((gFontPanelInfo.style & italic)!=0 ? ":i" : ""),
View
@@ -3218,8 +3218,7 @@ gui_mch_call_shell(cmd, options)
length = out_redir - cmd;
out_file = fopen(out_redir + 3, "wb");
if (out_file == NULL)
- msg_str("WARNING : Can't open file %s for writing\n",
- out_redir + 3);
+ smsg("WARNING : Can't open file %s for writing\n", out_redir + 3);
}
if (length > 180)
View
@@ -169,9 +169,9 @@ name_part(char *font, char *buf)
get_part(font, 1, buf3);
if (strlen(buf3))
- sprintf(buf, "%s (%s)", buf2, buf3);
+ vim_snprintf(buf, TEMP_BUF_SIZE, "%s (%s)", buf2, buf3);
else
- sprintf(buf, "%s", buf2);
+ vim_snprintf(buf, TEMP_BUF_SIZE, "%s", buf2);
}
/*
@@ -188,23 +188,23 @@ style_part(char *font, char *buf)
if (!strcmp(buf2, "normal") && !strcmp(buf2, "Normal")
&& !strcmp(buf2, "NORMAL"))
- sprintf(buf, "%s %s", buf3, buf2);
+ vim_snprintf(buf, TEMP_BUF_SIZE, "%s %s", buf3, buf2);
else
strcpy(buf, buf3);
get_part(font, 6, buf2);
if (buf2[0] != '\0')
- sprintf(buf3, "%s %s", buf, buf2);
+ vim_snprintf(buf3, TEMP_BUF_SIZE, "%s %s", buf, buf2);
else
strcpy(buf3, buf);
get_part(font, 4, buf2);
if (!strcmp(buf2, "o") || !strcmp(buf2, "O"))
- sprintf(buf, "%s oblique", buf3);
+ vim_snprintf(buf, TEMP_BUF_SIZE, "%s oblique", buf3);
else if (!strcmp(buf2, "i") || !strcmp(buf2, "I"))
- sprintf(buf, "%s italic", buf3);
+ vim_snprintf(buf, TEMP_BUF_SIZE, "%s italic", buf3);
if (!strcmp(buf, " "))
strcpy(buf, "-");
@@ -262,7 +262,7 @@ encoding_part(char *font, char *buf)
get_part(font, 14, buf2);
if (strlen(buf1) > 0 && strlen(buf2))
- sprintf(buf, "%s-%s", buf1, buf2);
+ vim_snprintf(buf, TEMP_BUF_SIZE, "%s-%s", buf1, buf2);
if (!strcmp(buf, " "))
strcpy(buf, "-");
}
@@ -551,7 +551,7 @@ stoggle_callback(Widget w,
XmToggleButtonCallbackStruct *call_data)
{
int i, do_sel;
- char newSize[10];
+ char newSize[TEMP_BUF_SIZE];
XmString str;
if (call_data->reason != (int)XmCR_VALUE_CHANGED)
View
@@ -2125,7 +2125,7 @@ cs_reset(eap)
{
char **dblist = NULL, **pplist = NULL, **fllist = NULL;
int i;
- char buf[8]; /* for sprintf " (#%d)" */
+ char buf[20]; /* for sprintf " (#%d)" */
/* malloc our db and ppath list */
dblist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
View
@@ -2255,6 +2255,7 @@ mb_strnicmp(s1, s2, n)
show_utf8()
{
int len;
+ int rlen = 0;
char_u *line;
int clen;
int i;
@@ -2269,19 +2270,24 @@ show_utf8()
return;
}
- IObuff[0] = NUL;
clen = 0;
for (i = 0; i < len; ++i)
{
if (clen == 0)
{
/* start of (composing) character, get its length */
if (i > 0)
- STRCAT(IObuff, "+ ");
+ {
+ STRCPY(IObuff + rlen, "+ ");
+ rlen += 2;
+ }
clen = utf_ptr2len_check(line + i);
}
- sprintf((char *)IObuff + STRLEN(IObuff), "%02x ", line[i]);
+ sprintf((char *)IObuff + rlen, "%02x ", line[i]);
--clen;
+ rlen += STRLEN(IObuff + rlen);
+ if (rlen > IOSIZE - 20)
+ break;
}
msg(IObuff);
Oops, something went wrong.

0 comments on commit 3177219

Please sign in to comment.