Skip to content

Commit 99151b7

Browse files
committed
Update runtime files.
1 parent 0c870b1 commit 99151b7

File tree

11 files changed

+170
-86
lines changed

11 files changed

+170
-86
lines changed

runtime/doc/index.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*index.txt* For Vim version 7.4. Last change: 2013 Oct 01
1+
*index.txt* For Vim version 7.4. Last change: 2013 Nov 14
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1275,6 +1275,7 @@ tag command action ~
12751275
|:keepalt| :keepa[lt] following command keeps the alternate file
12761276
|:keepmarks| :kee[pmarks] following command keeps marks where they are
12771277
|:keepjumps| :keepj[umps] following command keeps jumplist and marks
1278+
|:keeppatterns| :keepp[atterns] following command keeps search pattern history
12781279
|:lNext| :lN[ext] go to previous entry in location list
12791280
|:lNfile| :lNf[ile] go to last entry in previous file
12801281
|:list| :l[ist] print lines

runtime/doc/options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 7.4. Last change: 2013 Nov 06
1+
*options.txt* For Vim version 7.4. Last change: 2013 Nov 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar

runtime/doc/pattern.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*pattern.txt* For Vim version 7.4. Last change: 2013 Jul 06
1+
*pattern.txt* For Vim version 7.4. Last change: 2013 Nov 09
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar

runtime/doc/spell.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*spell.txt* For Vim version 7.4. Last change: 2013 Jul 17
1+
*spell.txt* For Vim version 7.4. Last change: 2013 Nov 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar

runtime/doc/tags

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2300,6 +2300,8 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
23002300
:keepj motion.txt /*:keepj*
23012301
:keepjumps motion.txt /*:keepjumps*
23022302
:keepmarks motion.txt /*:keepmarks*
2303+
:keepp cmdline.txt /*:keepp*
2304+
:keeppatterns cmdline.txt /*:keeppatterns*
23032305
:l various.txt /*:l*
23042306
:lN quickfix.txt /*:lN*
23052307
:lNext quickfix.txt /*:lNext*
@@ -7791,6 +7793,7 @@ spell-affix-flags spell.txt /*spell-affix-flags*
77917793
spell-affix-mbyte spell.txt /*spell-affix-mbyte*
77927794
spell-affix-not-supported spell.txt /*spell-affix-not-supported*
77937795
spell-affix-vim spell.txt /*spell-affix-vim*
7796+
spell-cjk spell.txt /*spell-cjk*
77947797
spell-compound spell.txt /*spell-compound*
77957798
spell-dic-format spell.txt /*spell-dic-format*
77967799
spell-double-scoring spell.txt /*spell-double-scoring*

runtime/doc/todo.txt

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4. Last change: 2013 Nov 09
1+
*todo.txt* For Vim version 7.4. Last change: 2013 Nov 14
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -80,9 +80,6 @@ Await response from maintainer.
8080

8181
Include systemverilog file? Two votes yes.
8282

83-
Patch to add :keeppatterns, don't put used search patterns in history.
84-
(Christian Brabandt, 2013 Oct 18)
85-
8683
Problem with 'spellsuggest' file, only works for some words.
8784
(Cesar Romani, 2013 Aug 20) Depends on file name? (Aug 24)
8885
Additional remark by glts: the suggested words are marked bad?
@@ -93,45 +90,19 @@ Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19)
9390

9491
Issue 174: Detect Mason files.
9592

96-
Patch for Python: Fix interrupt not being properly discarded in VimTryEnd.
97-
With tests. (ZyX, 2013 Oct 19) Reported by Yggdroot Chen.
98-
9993
Patch to make has() check for Vim version and patch at the same time.
10094
(Marc Weber, 2013 Jun 7)
10195

102-
Patch to fix Visual-block insert using cursor keys. (Christian Brabandt, 2013
103-
Sep 28) With test Sept 29.
104-
10596
VMS: Select() doesn't work properly, typing ESC may hang Vim. Use sys$qiow
10697
instead. (Samuel Ferencik, 2013 Sep 28)
10798

108-
Series of patches for NL vs NUL handling. (ZyX, 2013 Nov 3)
99+
Series of patches for NL vs NUL handling. (ZyX, 2013 Nov 3, Nov 9)
109100

110101
Perl: support for Activestate perl 5.18: Issue 170.
111102

112-
Bug: Does not skip over expression with dict member properly. (ZyX, 2013 Sep
113-
29)
114-
Patch to fix expr7() when skipping. (2013 Oct 15) Oct 23 with test.
115-
116103
Several syntax file match "^\s*" which may get underlined if that's in the
117104
highlight group. Add a "\zs" after it?
118105

119-
- Have an option for spell checking to not mark any Chinese, Japanese or
120-
other double-width characters (or CJK characters) as error.
121-
Helps a lot for mixed Asian and latin text.
122-
More general: Have some way not to give spelling errors for a range of
123-
characters.
124-
Patch to add "cjk" to 'spelllang'. (Ken Takata, 2013 Oct 8, second one)
125-
126-
Patch to add mch_copy_sec() to vim_rename().
127-
bug report on redhat. (Peter Backes, 2013 oct 8)
128-
Patch to vim-dev, 2013 Oct 9.
129-
130-
Win32: When a directory name contains an exclamation mark, completion doesn't
131-
complete the contents of the directory. No escaping for the "!"? (Jan
132-
Stocker, 2012 Jan 5; 2013 Aug 20)
133-
Patch 2013 Sept 10, test: Sept 11.
134-
135106
Go through more coverity reports.
136107

137108
Include Haiku port? (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24)
@@ -148,6 +119,7 @@ With "$" in 'cpoptions' the popup menu isn't fully drawn. (Matti Niemenmaa,
148119

149120
"gUgn" cannot be repeated, while "dgn" can. (Dimitar Dimitrov)
150121
Patch by Christian Brabandt (2013 Aug 12)
122+
Also notes by Christian Wellenbrock, Nov 13.
151123

152124
Several Win32 functions are not using Unicode.
153125
Patches to fix this. (Ken Takata, 2013 Aug 9)
@@ -223,7 +195,7 @@ carried over when using :global. (Christian Brabandt, 2013 Jun 19)
223195
Bug with 'cursorline' in diff mode. Line being scrolled into view gets
224196
highlighted as the cursor line. (Alessandro Ivaldi, 2013 Jun 4)
225197

226-
Two highlighting bugs. (Zyx, 2013 Aug 18)
198+
Two highlighting bugs. (ZyX, 2013 Aug 18)
227199

228200
Patch to add the bufferlist() function. (Yegappan Lakshmanan, 2013 May 5)
229201
May 17: with winlist() and tabpagelist().
@@ -980,7 +952,7 @@ Session file generates error upon loading, cause by --remote-silent-tab.
980952
Using ~ works OK on 'a' with composing char, but not on 0x0418 with composing
981953
char 0x0301. (Tony Mechelynck, 2009 Mar 4)
982954

983-
A function on a dictionary is not profiled. (Zyx, 2010 Dec 25)
955+
A function on a dictionary is not profiled. (ZyX, 2010 Dec 25)
984956

985957
Inconsistent: starting with $LANG set to es_ES.utf-8 gives Spanish
986958
messages, even though locale is not supported. But ":lang messages
@@ -1426,6 +1398,8 @@ Check for this and use iconv? (Edward L. Fox, 2007 Sep 12)
14261398
Does the conversion in the other direction work when 'fileencodings' is set
14271399
properly?
14281400

1401+
Add a few features to xxd. (Vadim Vygonets, 2013 Nov 11)
1402+
14291403
Cursor displayed in the wrong position when using 'numberwidth'. (James Vega,
14301404
2007 Jun 21)
14311405

runtime/filetype.vim

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim support file to detect file types
22
"
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last Change: 2013 Oct 06
4+
" Last Change: 2013 Nov 13
55

66
" Listen very carefully, I will say this only once
77
if exists("did_load_filetypes")
@@ -1172,6 +1172,9 @@ au BufNewFile,BufRead *.mp setf mp
11721172
" MGL
11731173
au BufNewFile,BufRead *.mgl setf mgl
11741174

1175+
" MIX - Knuth assembly
1176+
au BufNewFile,BufRead *.mix,*.mixal setf mix
1177+
11751178
" MMIX or VMS makefile
11761179
au BufNewFile,BufRead *.mms call s:FTmms()
11771180

runtime/syntax/masm.vim

Lines changed: 66 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
" Language: Microsoft Macro Assembler (80x86)
33
" Orig Author: Rob Brady <[email protected]>
44
" Maintainer: Wu Yongwei <[email protected]>
5-
" Last Change: $Date: 2012/02/04 12:45:39 $
6-
" $Revision: 1.46 $
7-
8-
" For version 5.x: Clear all syntax items
9-
" For version 6.x: Quit when a syntax file was already loaded
10-
if version < 600
11-
syntax clear
12-
elseif exists("b:current_syntax")
5+
" Last Change: $Date: 2013/11/13 11:49:24 $
6+
" $Revision: 1.48 $
7+
8+
" Quit when a syntax file was already loaded
9+
if exists("b:current_syntax")
1310
finish
1411
endif
1512

@@ -194,6 +191,10 @@ syn keyword masmRegister R8D R9D R10D R11D R12D R13D R14D R15D
194191
syn keyword masmRegister R8W R9W R10W R11W R12W R13W R14W R15W
195192
syn keyword masmRegister R8B R9B R10B R11B R12B R13B R14B R15B
196193

194+
" SSE/AVX registers
195+
syn match masmRegister "\(X\|Y\)MM[0-9]\>"
196+
syn match masmRegister "\(X\|Y\)MM1[0-5]\>"
197+
197198
" Instruction prefixes
198199
syn keyword masmOpcode LOCK REP REPE REPNE REPNZ REPZ
199200

@@ -302,50 +303,69 @@ syn keyword masmOpcode FISTTP LDDQU ADDSUBPS ADDSUBPD
302303
syn keyword masmOpcode HADDPS HSUBPS HADDPD HSUBPD
303304
syn keyword masmOpcode MOVSHDUP MOVSLDUP MOVDDUP MONITOR MWAIT
304305

306+
" SSSE3 opcodes (Core and later)
307+
syn keyword masmOpcode PSIGNB PSIGNW PSIGND PABSB PABSW PABSD
308+
syn keyword masmOpcode PALIGNR PSHUFB PMULHRSW PMADDUBSW
309+
syn keyword masmOpcode PHSUBW PHSUBD PHSUBSW PHADDW PHADDD PHADDSW
310+
311+
" SSE 4.1 opcodes (Penryn and later)
312+
syn keyword masmOpcode MPSADBW PHMINPOSUW PMULDQ PMULLD DPPS DPPD
313+
syn keyword masmOpcode BLENDPS BLENDPD BLENDVPS BLENDVPD
314+
syn keyword masmOpcode PBLENDVB PBLENDW
315+
syn keyword masmOpcode PMINSB PMAXSB PMINSD PMAXSD
316+
syn keyword masmOpcode PMINUW PMAXUW PMINUD PMAXUD
317+
syn keyword masmOpcode ROUNDPS ROUNDSS ROUNDPD ROUNDSD
318+
syn keyword masmOpcode INSERTPS PINSRB PINSRD PINSRQ
319+
syn keyword masmOpcode EXTRACTPS PEXTRB PEXTRD PEXTRQ
320+
syn keyword masmOpcode PMOVSXBW PMOVZXBW PMOVSXBD PMOVZXBD
321+
syn keyword masmOpcode PMOVSXBQ PMOVZXBQ PMOVSXWD PMOVZXWD
322+
syn keyword masmOpcode PMOVSXWQ PMOVZXWQ PMOVSXDQ PMOVZXDQ
323+
syn keyword masmOpcode PTEST PCMPEQQ PACKUSDW MOVNTDQA
324+
325+
" SSE 4.2 opcodes (Nehalem and later)
326+
syn keyword masmOpcode PCMPESTRI PCMPESTRM PCMPISTRI PCMPISTRM PCMPGTQ
327+
syn keyword masmOpcode CRC32 POPCNT LZCNT
328+
329+
" AES-NI (Westmere (2010) and later)
330+
syn keyword masmOpcode AESENC AESENCLAST AESDEC AESDECLAST
331+
syn keyword masmOpcode AESKEYGENASSIST AESIMC PCLMULQDQ
332+
333+
" AVX (Sandy Bridge (2011) and later)
334+
syn keyword masmOpcode VBROADCASTSS VBROADCASTSD VBROADCASTF128
335+
syn keyword masmOpcode VINSERTF128 VEXTRACTF128 VMASKMOVPS VMASKMOVPD
336+
syn keyword masmOpcode VPERMILPS VPERMILPD VPERM2F128
337+
syn keyword masmOpcode VZEROALL VZEROUPPER
338+
305339
" Other opcodes in Pentium and later processors
306340
syn keyword masmOpcode CMPXCHG8B CPUID UD2
307341
syn keyword masmOpcode RSM RDMSR WRMSR RDPMC RDTSC SYSENTER SYSEXIT
308342
syn match masmOpcode "CMOV\(P[EO]\|\(N\?\([ABGL]E\?\|[CEOPSZ]\)\)\)\>"
309343

310344

311-
" Define the default highlighting.
312-
" For version 5.7 and earlier: only when not done already
313-
" For version 5.8 and later: only when an item doesn't have highlighting yet
314-
if version >= 508 || !exists("did_masm_syntax_inits")
315-
if version < 508
316-
let did_masm_syntax_inits = 1
317-
command -nargs=+ HiLink hi link <args>
318-
else
319-
command -nargs=+ HiLink hi def link <args>
320-
endif
321-
322-
" The default methods for highlighting. Can be overridden later
323-
HiLink masmLabel PreProc
324-
HiLink masmComment Comment
325-
HiLink masmDirective Statement
326-
HiLink masmType Type
327-
HiLink masmOperator Type
328-
HiLink masmOption Special
329-
HiLink masmRegister Special
330-
HiLink masmString String
331-
HiLink masmText String
332-
HiLink masmTitle Title
333-
HiLink masmOpcode Statement
334-
HiLink masmOpFloat Statement
335-
336-
HiLink masmHexadecimal Number
337-
HiLink masmDecimal Number
338-
HiLink masmOctal Number
339-
HiLink masmBinary Number
340-
HiLink masmFloatRaw Number
341-
HiLink masmFloat Number
342-
343-
HiLink masmIdentifier Identifier
344-
345-
syntax sync minlines=50
346-
347-
delcommand HiLink
348-
endif
345+
" The default highlighting
346+
hi def link masmLabel PreProc
347+
hi def link masmComment Comment
348+
hi def link masmDirective Statement
349+
hi def link masmType Type
350+
hi def link masmOperator Type
351+
hi def link masmOption Special
352+
hi def link masmRegister Special
353+
hi def link masmString String
354+
hi def link masmText String
355+
hi def link masmTitle Title
356+
hi def link masmOpcode Statement
357+
hi def link masmOpFloat Statement
358+
359+
hi def link masmHexadecimal Number
360+
hi def link masmDecimal Number
361+
hi def link masmOctal Number
362+
hi def link masmBinary Number
363+
hi def link masmFloatRaw Number
364+
hi def link masmFloat Number
365+
366+
hi def link masmIdentifier Identifier
367+
368+
syntax sync minlines=50
349369

350370
let b:current_syntax = "masm"
351371

runtime/syntax/mix.vim

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
" Vim syntax file
2+
" Language: MIX (Donald Knuth's assembly language used in TAOCP)
3+
" Maintainer: Wu Yongwei <[email protected]>
4+
" Filenames: *.mixal *.mix
5+
" Last Change: 2013 Nov 13
6+
7+
" Quit when a syntax file was already loaded
8+
if exists("b:current_syntax")
9+
finish
10+
endif
11+
12+
let s:cpo_save = &cpo
13+
set cpo&vim
14+
15+
syn case ignore
16+
17+
" Special processing of ALF directive: implementations vary whether quotation
18+
" marks are needed
19+
syn match mixAlfParam #\s\{1,2\}"\?[^"]\{,5\}"\?# contains=mixAlfDirective,mixString nextgroup=mixEndComment contained
20+
21+
" Region for parameters
22+
syn match mixParam #[-+*/:=0-9a-z,()"]\+# contains=mixIdentifier,mixSpecial,mixNumber,mixString,mixLabel nextgroup=mixEndComment contained
23+
24+
" Comment at the line end
25+
syn match mixEndComment ".*" contains=mixRegister contained
26+
27+
" Identifier; must go before literals
28+
syn match mixIdentifier "[a-z0-9_]\+" contained
29+
30+
" Literals
31+
syn match mixSpecial "[-+*/:=]" contained
32+
syn match mixNumber "[0-9]\+\>" contained
33+
syn region mixString start=+"+ skip=+\\"+ end=+"+ contained
34+
35+
" Labels
36+
syn match mixLabel "^[a-z0-9_]\{,10\}\s\+" nextgroup=mixAlfSpecial,mixOpcode,mixDirective
37+
syn match mixLabel "[0-9][BF]" contained
38+
39+
" Comments
40+
syn match mixComment "^\*.*" contains=mixRegister
41+
42+
" Directives
43+
syn keyword mixDirective ORIG EQU CON END nextgroup=mixParam contained skipwhite
44+
syn keyword mixDirective ALF nextgroup=mixAlfParam contained
45+
46+
" Opcodes
47+
syn keyword mixOpcode NOP HLT NUM CHAR FLOT FIX nextgroup=mixEndComment contained
48+
syn keyword mixOpcode FADD FSUB FMUL FDIV FCMP MOVE ADD SUB MUL DIV IOC IN OUT JRED JBUS JMP JSJ JOV JNOV JL JE JG JLE JNE JGE SLA SRA SLAX SRAX SLC SRC nextgroup=mixParam contained skipwhite
49+
50+
syn match mixOpcode "LD[AX1-6]N\?\>" nextgroup=mixParam contained skipwhite
51+
syn match mixOpcode "ST[AX1-6JZ]\>" nextgroup=mixParam contained skipwhite
52+
syn match mixOpcode "EN[TN][AX1-6]\>" nextgroup=mixParam contained skipwhite
53+
syn match mixOpcode "INC[AX1-6]\>" nextgroup=mixParam contained skipwhite
54+
syn match mixOpcode "DEC[AX1-6]\>" nextgroup=mixParam contained skipwhite
55+
syn match mixOpcode "CMP[AX1-6]\>" nextgroup=mixParam contained skipwhite
56+
syn match mixOpcode "J[AX1-6]N\?[NZP]\>" nextgroup=mixParam contained skipwhite
57+
58+
" Switch back to being case sensitive
59+
syn case match
60+
61+
" Registers (only to used in comments now)
62+
syn keyword mixRegister rA rX rI1 rI2 rI3 rI4 rI5 rI6 rJ contained
63+
64+
" The default highlighting
65+
hi def link mixRegister Special
66+
hi def link mixLabel Define
67+
hi def link mixComment Comment
68+
hi def link mixEndComment Comment
69+
hi def link mixDirective Keyword
70+
hi def link mixOpcode Keyword
71+
72+
hi def link mixSpecial Special
73+
hi def link mixNumber Number
74+
hi def link mixString String
75+
hi def link mixAlfParam String
76+
hi def link mixIdentifier Identifier
77+
78+
let b:current_syntax = "mix"
79+
80+
let &cpo = s:cpo_save
81+
unlet s:cpo_save
82+
83+
" vim: ts=8

runtime/tutor/tutor.it

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ NOTA: Tutti i comandi : devono essere terminati premendo <INVIO>
638638
NOTA: Se esci da Vim e riesegui Vim battendo vim TEST , il file aperto
639639
sar� una copia esatta di "tutor.it" al momento del salvataggio.
640640

641-
5. Ora cancella il file battendo (MR-DOS): :!del TEST
641+
5. Ora cancella il file battendo (MS-DOS): :!del TEST
642642
o (Unix): :!rm TEST
643643

644644

0 commit comments

Comments
 (0)