aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.0072

Browse Source
This commit is contained in:
Bram Moolenaar
2005-05-18 22:10:28 +00:00
parent d8a4e563d0
commit d9d305836e
7 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/doc/editing.txt
View File

@@ -1,4 +1,4 @@
*editing.txt* For Vim version 7.0aa. Last change: 2005 Apr 04 *editing.txt* For Vim version 7.0aa. Last change: 2005 Apr 27
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -54,12 +54,12 @@ and then hit CTRL-^. {Vi: only one alternate file name is remembered}
CTRL-G or *CTRL-G* *:f* *:fi* *:file* CTRL-G or *CTRL-G* *:f* *:fi* *:file*
:f[ile] Prints the current file name (as typed), the :f[ile] Prints the current file name (as typed, unless ":cd"
cursor position (unless the 'ruler' option is set), was used), the cursor position (unless the 'ruler'
and the file status (readonly, modified, read errors, option is set), and the file status (readonly,
new file). See the 'shortmess' option about how to modified, read errors, new file). See the 'shortmess'
make this message shorter. {Vi does not include option about how to make this message shorter.
column number} {Vi does not include column number}
:f[ile]! like |:file|, but don't truncate the name even when :f[ile]! like |:file|, but don't truncate the name even when
'shortmess' indicates this. 'shortmess' indicates this.

30
runtime/syntax/crontab.vim
View File

@@ -1,9 +1,10 @@
" Vim syntax file " Vim syntax file
" Language: crontab 2.3.3 " Language: crontab
" Maintainer: John Hoelzel johnh51@users.sourceforge.net " Maintainer: John Hoelzel johnh51@users.sourceforge.net
" Last change: Mon Jun 9 2003 " Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
" Filenames: /tmp/crontab.* used by "crontab -e" " Last Change: 2005-04-26
" URL: http://johnh51.get.to/vim/syntax/crontab.vim " Filenames: /tmp/crontab.* used by "crontab -e"
" URL: http://trific.ath.cx/Ftp/vim/syntax/crontab.vim
" "
" crontab line format: " crontab line format:
" Minutes Hours Days Months Days_of_Week Commands # comments " Minutes Hours Days Months Days_of_Week Commands # comments
@@ -16,20 +17,24 @@ elseif exists("b:current_syntax")
finish finish
endif endif
syntax match crontabMin "\_^[0-9\-\/\,\.]\{}\>\|\*" nextgroup=crontabHr skipwhite syntax match crontabMin "^\s*[-0-9/,.*]\+" nextgroup=crontabHr skipwhite
syntax match crontabHr "\<[0-9\-\/\,\.]\{}\>\|\*" nextgroup=crontabDay skipwhite contained syntax match crontabHr "\s[-0-9/,.*]\+" nextgroup=crontabDay skipwhite contained
syntax match crontabDay "\<[0-9\-\/\,\.]\{}\>\|\*" nextgroup=crontabMnth skipwhite contained syntax match crontabDay "\s[-0-9/,.*]\+" nextgroup=crontabMnth skipwhite contained
syntax match crontabMnth "\<[a-z0-9\-\/\,\.]\{}\>\|\*" nextgroup=crontabDow skipwhite contained syntax match crontabMnth "\s[-a-z0-9/,.*]\+" nextgroup=crontabDow skipwhite contained
syntax keyword crontabMnth12 contained jan feb mar apr may jun jul aug sep oct nov dec syntax keyword crontabMnth12 contained jan feb mar apr may jun jul aug sep oct nov dec
syntax match crontabDow "\<[a-z0-9\-\/\,\.]\{}\>\|\*" nextgroup=crontabCmd skipwhite contained syntax match crontabDow "\s[-a-z0-9/,.*]\+" nextgroup=crontabCmd skipwhite contained
syntax keyword crontabDow7 contained sun mon tue wed thu fri sat syntax keyword crontabDow7 contained sun mon tue wed thu fri sat
" syntax region crontabCmd start="\<[a-z0-9\/\(]" end="$" nextgroup=crontabCmnt skipwhite contained contains=crontabCmnt keepend " syntax region crontabCmd start="\<[a-z0-9\/\(]" end="$" nextgroup=crontabCmnt skipwhite contained contains=crontabCmnt keepend
syntax region crontabCmd start="\S" end="$" nextgroup=crontabCmnt skipwhite contained contains=crontabCmnt keepend syntax region crontabCmd start="\S" end="$" nextgroup=crontabCmnt skipwhite contained keepend
syntax match crontabCmnt /#.*/ syntax match crontabCmnt "^\s*#.*"
syntax match crontabNick "^\s*@\(reboot\|yearly\|annually\|monthly\|weekly\|daily\|midnight\|hourly\)\>" nextgroup=crontabCmd skipwhite
syntax match crontabVar "^\s*\k\w*\s*="me=e-1
" Define the default highlighting. " Define the default highlighting.
" For version 5.7 and earlier: only when not done already " For version 5.7 and earlier: only when not done already
@@ -56,6 +61,9 @@ if version >= 508 || !exists("did_crontab_syn_inits")
HiLink crontabDowS PreProc HiLink crontabDowS PreProc
HiLink crontabDowN PreProc HiLink crontabDowN PreProc
HiLink crontabNick Special
HiLink crontabVar Identifier
" comment out next line for to suppress unix commands coloring. " comment out next line for to suppress unix commands coloring.
HiLink crontabCmd Type HiLink crontabCmd Type

20
src/Make_mvc.mak
View File

@@ -296,8 +296,6 @@ OPTFLAG = /Ox
!endif !endif
CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG) CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
PDB =
LINK_PDB =
! ifdef USE_MSVCRT ! ifdef USE_MSVCRT
CFLAGS = $(CFLAGS) -MD CFLAGS = $(CFLAGS) -MD
LIBC = msvcrt.lib LIBC = msvcrt.lib
@@ -308,13 +306,7 @@ LIBC = libc.lib
! endif ! endif
!else # DEBUG !else # DEBUG
VIM = vimd VIM = vimd
# MSVC 4.1 CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /Od
PDB = /Fd$(OUTDIR)/
LINK_PDB = /PDB:$(OUTDIR)/
# MSVC 2.2
# PDB = /Fd$(OUTDIR)/vim.pdb
# LINK_PDB = /PDB:$(OUTDIR)/vim.pdb
CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /Zi /Od
RCFLAGS = $(rcflags) $(rcvars) -D_DEBUG -DDEBUG RCFLAGS = $(rcflags) $(rcvars) -D_DEBUG -DDEBUG
# The /fixed:no is needed for Quantify. Assume not 4.? as unsupported in VC4.0. # The /fixed:no is needed for Quantify. Assume not 4.? as unsupported in VC4.0.
! if "$(_NMAKE_VER)" == "" ! if "$(_NMAKE_VER)" == ""
@@ -620,7 +612,15 @@ FEATURES = BIG
CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES) CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES)
# #
# End extra featuare include # Always generate the .pdb file, so that we get debug symbols that can be used
# on a crash (doesn't add overhead to the executable).
#
CFLAGS = $(CFLAGS) /Zi
PDB = /Fd$(OUTDIR)/
LINK_PDB = /PDB:$(OUTDIR)/$(VIM).pdb -debug:full -debugtype:cv,fixup
#
# End extra feature include
# #
!message !message

6
src/ex_docmd.c
View File

@@ -7815,8 +7815,8 @@ ex_redir(eap)
|| *arg == '"') || *arg == '"')
{ {
redir_reg = *arg++; redir_reg = *arg++;
if (*arg == '>') if (*arg == '>' && arg[1] == '>')
++arg; arg += 2;
else if (*arg == NUL && (islower(redir_reg) else if (*arg == NUL && (islower(redir_reg)
# ifdef FEAT_CLIPBOARD # ifdef FEAT_CLIPBOARD
|| redir_reg == '*' || redir_reg == '*'
@@ -7829,8 +7829,8 @@ ex_redir(eap)
} }
if (*arg != NUL) if (*arg != NUL)
{ {
EMSG2(_(e_invarg2), eap->arg);
redir_reg = 0; redir_reg = 0;
EMSG2(_(e_invarg2), eap->arg);
} }
} }
else if (*arg == '=' && arg[1] == '>') else if (*arg == '=' && arg[1] == '>')

10
src/normal.c
View File

@@ -3929,13 +3929,17 @@ nv_gd(oap, nchar)
int save_p_scs; int save_p_scs;
char_u *ptr; char_u *ptr;
if ((len = find_ident_under_cursor(&ptr, FIND_IDENT)) == 0 || if ((len = find_ident_under_cursor(&ptr, FIND_IDENT)) == 0
(pat = alloc(len + 5)) == NULL) || (pat = alloc(len + 7)) == NULL)
{ {
clearopbeep(oap); clearopbeep(oap);
return; return;
} }
sprintf((char *)pat, vim_iswordp(ptr) ? "\\<%.*s\\>" : "%.*s", len, ptr);
/* Put "\V" before the pattern to avoid that the special meaning of "."
* and "~" causes trouble. */
sprintf((char *)pat, vim_iswordp(ptr) ? "\\V\\<%.*s\\>" : "\\V%.*s",
len, ptr);
old_pos = curwin->w_cursor; old_pos = curwin->w_cursor;
save_p_ws = p_ws; save_p_ws = p_ws;
save_p_scs = p_scs; save_p_scs = p_scs;

3
src/testdir/Make_os2.mak
View File

@@ -23,7 +23,8 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
test33.out test34.out test35.out test36.out test37.out \ test33.out test34.out test35.out test36.out test37.out \
test38.out test39.out test40.out test41.out test42.out \ test38.out test39.out test40.out test41.out test42.out \
test43.out test44.out test45.out test46.out test47.out \ test43.out test44.out test45.out test46.out test47.out \
test48.out test51.out test53.out test54.out test55.out test48.out test51.out test53.out test54.out test55.out \
test56.out
.SUFFIXES: .in .out .SUFFIXES: .in .out

10
src/vim.h
View File

@@ -1227,7 +1227,15 @@ enum hlf_value
#define LSIZE 512 /* max. size of a line in the tags file */ #define LSIZE 512 /* max. size of a line in the tags file */
#define IOSIZE (1024+1) /* file i/o and sprintf buffer size */ #define IOSIZE (1024+1) /* file i/o and sprintf buffer size */
#define MSG_BUF_LEN 80 /* length of buffer for small messages */
#ifdef FEAT_MBYTE
# define MSG_BUF_LEN 480 /* length of buffer for small messages */
# define MSG_BUF_CLEN (MSG_BUF_LEN / 6) /* cell length (worst case: utf-8
takes 6 bytes for one cell) */
#else
# define MSG_BUF_LEN 80 /* length of buffer for small messages */
# define MSG_BUF_CLEN MSG_BUF_LEN /* cell length */
#endif
#if defined(AMIGA) || defined(__linux__) || defined(__QNX__) || defined(__CYGWIN32__) || defined(_AIX) #if defined(AMIGA) || defined(__linux__) || defined(__QNX__) || defined(__CYGWIN32__) || defined(_AIX)
# define TBUFSZ 2048 /* buffer size for termcap entry */ # define TBUFSZ 2048 /* buffer size for termcap entry */