diff options
| -rw-r--r-- | runtime/doc/index.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/pattern.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/spell.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/tags | 3 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 40 | ||||
| -rw-r--r-- | runtime/filetype.vim | 5 | ||||
| -rw-r--r-- | runtime/syntax/masm.vim | 112 | ||||
| -rw-r--r-- | runtime/syntax/mix.vim | 83 | ||||
| -rw-r--r-- | runtime/tutor/tutor.it | 2 | ||||
| -rw-r--r-- | runtime/tutor/tutor.it.utf-8 | 2 |
11 files changed, 170 insertions, 86 deletions
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 49f28f30a..68dceb943 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.4. Last change: 2013 Oct 01 +*index.txt* For Vim version 7.4. Last change: 2013 Nov 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1275,6 +1275,7 @@ tag command action ~ |:keepalt| :keepa[lt] following command keeps the alternate file |:keepmarks| :kee[pmarks] following command keeps marks where they are |:keepjumps| :keepj[umps] following command keeps jumplist and marks +|:keeppatterns| :keepp[atterns] following command keeps search pattern history |:lNext| :lN[ext] go to previous entry in location list |:lNfile| :lNf[ile] go to last entry in previous file |:list| :l[ist] print lines diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index a51590029..b7b66495e 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4. Last change: 2013 Nov 06 +*options.txt* For Vim version 7.4. Last change: 2013 Nov 12 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index edbeafde1..f2f0b34e3 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 7.4. Last change: 2013 Jul 06 +*pattern.txt* For Vim version 7.4. Last change: 2013 Nov 09 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index d2dde05ec..a39bec905 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.4. Last change: 2013 Jul 17 +*spell.txt* For Vim version 7.4. Last change: 2013 Nov 12 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tags b/runtime/doc/tags index 73475a9d6..755f993c8 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -2300,6 +2300,8 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* :keepj motion.txt /*:keepj* :keepjumps motion.txt /*:keepjumps* :keepmarks motion.txt /*:keepmarks* +:keepp cmdline.txt /*:keepp* +:keeppatterns cmdline.txt /*:keeppatterns* :l various.txt /*:l* :lN quickfix.txt /*:lN* :lNext quickfix.txt /*:lNext* @@ -7791,6 +7793,7 @@ spell-affix-flags spell.txt /*spell-affix-flags* spell-affix-mbyte spell.txt /*spell-affix-mbyte* spell-affix-not-supported spell.txt /*spell-affix-not-supported* spell-affix-vim spell.txt /*spell-affix-vim* +spell-cjk spell.txt /*spell-cjk* spell-compound spell.txt /*spell-compound* spell-dic-format spell.txt /*spell-dic-format* spell-double-scoring spell.txt /*spell-double-scoring* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 512a3827e..641af1c32 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2013 Nov 09 +*todo.txt* For Vim version 7.4. Last change: 2013 Nov 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -80,9 +80,6 @@ Await response from maintainer. Include systemverilog file? Two votes yes. -Patch to add :keeppatterns, don't put used search patterns in history. -(Christian Brabandt, 2013 Oct 18) - Problem with 'spellsuggest' file, only works for some words. (Cesar Romani, 2013 Aug 20) Depends on file name? (Aug 24) 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) Issue 174: Detect Mason files. -Patch for Python: Fix interrupt not being properly discarded in VimTryEnd. -With tests. (ZyX, 2013 Oct 19) Reported by Yggdroot Chen. - Patch to make has() check for Vim version and patch at the same time. (Marc Weber, 2013 Jun 7) -Patch to fix Visual-block insert using cursor keys. (Christian Brabandt, 2013 -Sep 28) With test Sept 29. - VMS: Select() doesn't work properly, typing ESC may hang Vim. Use sys$qiow instead. (Samuel Ferencik, 2013 Sep 28) -Series of patches for NL vs NUL handling. (ZyX, 2013 Nov 3) +Series of patches for NL vs NUL handling. (ZyX, 2013 Nov 3, Nov 9) Perl: support for Activestate perl 5.18: Issue 170. -Bug: Does not skip over expression with dict member properly. (ZyX, 2013 Sep -29) -Patch to fix expr7() when skipping. (2013 Oct 15) Oct 23 with test. - Several syntax file match "^\s*" which may get underlined if that's in the highlight group. Add a "\zs" after it? -- Have an option for spell checking to not mark any Chinese, Japanese or - other double-width characters (or CJK characters) as error. - Helps a lot for mixed Asian and latin text. - More general: Have some way not to give spelling errors for a range of - characters. -Patch to add "cjk" to 'spelllang'. (Ken Takata, 2013 Oct 8, second one) - -Patch to add mch_copy_sec() to vim_rename(). -bug report on redhat. (Peter Backes, 2013 oct 8) -Patch to vim-dev, 2013 Oct 9. - -Win32: When a directory name contains an exclamation mark, completion doesn't -complete the contents of the directory. No escaping for the "!"? (Jan -Stocker, 2012 Jan 5; 2013 Aug 20) -Patch 2013 Sept 10, test: Sept 11. - Go through more coverity reports. 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, "gUgn" cannot be repeated, while "dgn" can. (Dimitar Dimitrov) Patch by Christian Brabandt (2013 Aug 12) +Also notes by Christian Wellenbrock, Nov 13. Several Win32 functions are not using Unicode. Patches to fix this. (Ken Takata, 2013 Aug 9) @@ -223,7 +195,7 @@ carried over when using :global. (Christian Brabandt, 2013 Jun 19) Bug with 'cursorline' in diff mode. Line being scrolled into view gets highlighted as the cursor line. (Alessandro Ivaldi, 2013 Jun 4) -Two highlighting bugs. (Zyx, 2013 Aug 18) +Two highlighting bugs. (ZyX, 2013 Aug 18) Patch to add the bufferlist() function. (Yegappan Lakshmanan, 2013 May 5) May 17: with winlist() and tabpagelist(). @@ -980,7 +952,7 @@ Session file generates error upon loading, cause by --remote-silent-tab. Using ~ works OK on 'a' with composing char, but not on 0x0418 with composing char 0x0301. (Tony Mechelynck, 2009 Mar 4) -A function on a dictionary is not profiled. (Zyx, 2010 Dec 25) +A function on a dictionary is not profiled. (ZyX, 2010 Dec 25) Inconsistent: starting with $LANG set to es_ES.utf-8 gives Spanish 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) Does the conversion in the other direction work when 'fileencodings' is set properly? +Add a few features to xxd. (Vadim Vygonets, 2013 Nov 11) + Cursor displayed in the wrong position when using 'numberwidth'. (James Vega, 2007 Jun 21) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index f5ece1728..20775e9d2 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2013 Oct 06 +" Last Change: 2013 Nov 13 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -1172,6 +1172,9 @@ au BufNewFile,BufRead *.mp setf mp " MGL au BufNewFile,BufRead *.mgl setf mgl +" MIX - Knuth assembly +au BufNewFile,BufRead *.mix,*.mixal setf mix + " MMIX or VMS makefile au BufNewFile,BufRead *.mms call s:FTmms() diff --git a/runtime/syntax/masm.vim b/runtime/syntax/masm.vim index 1711601f3..bb3c9681b 100644 --- a/runtime/syntax/masm.vim +++ b/runtime/syntax/masm.vim @@ -2,14 +2,11 @@ " Language: Microsoft Macro Assembler (80x86) " Orig Author: Rob Brady <robb@datatone.com> " Maintainer: Wu Yongwei <wuyongwei@gmail.com> -" Last Change: $Date: 2012/02/04 12:45:39 $ -" $Revision: 1.46 $ - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") +" Last Change: $Date: 2013/11/13 11:49:24 $ +" $Revision: 1.48 $ + +" Quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -194,6 +191,10 @@ syn keyword masmRegister R8D R9D R10D R11D R12D R13D R14D R15D syn keyword masmRegister R8W R9W R10W R11W R12W R13W R14W R15W syn keyword masmRegister R8B R9B R10B R11B R12B R13B R14B R15B +" SSE/AVX registers +syn match masmRegister "\(X\|Y\)MM[0-9]\>" +syn match masmRegister "\(X\|Y\)MM1[0-5]\>" + " Instruction prefixes syn keyword masmOpcode LOCK REP REPE REPNE REPNZ REPZ @@ -302,50 +303,69 @@ syn keyword masmOpcode FISTTP LDDQU ADDSUBPS ADDSUBPD syn keyword masmOpcode HADDPS HSUBPS HADDPD HSUBPD syn keyword masmOpcode MOVSHDUP MOVSLDUP MOVDDUP MONITOR MWAIT +" SSSE3 opcodes (Core and later) +syn keyword masmOpcode PSIGNB PSIGNW PSIGND PABSB PABSW PABSD +syn keyword masmOpcode PALIGNR PSHUFB PMULHRSW PMADDUBSW +syn keyword masmOpcode PHSUBW PHSUBD PHSUBSW PHADDW PHADDD PHADDSW + +" SSE 4.1 opcodes (Penryn and later) +syn keyword masmOpcode MPSADBW PHMINPOSUW PMULDQ PMULLD DPPS DPPD +syn keyword masmOpcode BLENDPS BLENDPD BLENDVPS BLENDVPD +syn keyword masmOpcode PBLENDVB PBLENDW +syn keyword masmOpcode PMINSB PMAXSB PMINSD PMAXSD +syn keyword masmOpcode PMINUW PMAXUW PMINUD PMAXUD +syn keyword masmOpcode ROUNDPS ROUNDSS ROUNDPD ROUNDSD +syn keyword masmOpcode INSERTPS PINSRB PINSRD PINSRQ +syn keyword masmOpcode EXTRACTPS PEXTRB PEXTRD PEXTRQ +syn keyword masmOpcode PMOVSXBW PMOVZXBW PMOVSXBD PMOVZXBD +syn keyword masmOpcode PMOVSXBQ PMOVZXBQ PMOVSXWD PMOVZXWD +syn keyword masmOpcode PMOVSXWQ PMOVZXWQ PMOVSXDQ PMOVZXDQ +syn keyword masmOpcode PTEST PCMPEQQ PACKUSDW MOVNTDQA + +" SSE 4.2 opcodes (Nehalem and later) +syn keyword masmOpcode PCMPESTRI PCMPESTRM PCMPISTRI PCMPISTRM PCMPGTQ +syn keyword masmOpcode CRC32 POPCNT LZCNT + +" AES-NI (Westmere (2010) and later) +syn keyword masmOpcode AESENC AESENCLAST AESDEC AESDECLAST +syn keyword masmOpcode AESKEYGENASSIST AESIMC PCLMULQDQ + +" AVX (Sandy Bridge (2011) and later) +syn keyword masmOpcode VBROADCASTSS VBROADCASTSD VBROADCASTF128 +syn keyword masmOpcode VINSERTF128 VEXTRACTF128 VMASKMOVPS VMASKMOVPD +syn keyword masmOpcode VPERMILPS VPERMILPD VPERM2F128 +syn keyword masmOpcode VZEROALL VZEROUPPER + " Other opcodes in Pentium and later processors syn keyword masmOpcode CMPXCHG8B CPUID UD2 syn keyword masmOpcode RSM RDMSR WRMSR RDPMC RDTSC SYSENTER SYSEXIT syn match masmOpcode "CMOV\(P[EO]\|\(N\?\([ABGL]E\?\|[CEOPSZ]\)\)\)\>" -" Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_masm_syntax_inits") - if version < 508 - let did_masm_syntax_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - - " The default methods for highlighting. Can be overridden later - HiLink masmLabel PreProc - HiLink masmComment Comment - HiLink masmDirective Statement - HiLink masmType Type - HiLink masmOperator Type - HiLink masmOption Special - HiLink masmRegister Special - HiLink masmString String - HiLink masmText String - HiLink masmTitle Title - HiLink masmOpcode Statement - HiLink masmOpFloat Statement - - HiLink masmHexadecimal Number - HiLink masmDecimal Number - HiLink masmOctal Number - HiLink masmBinary Number - HiLink masmFloatRaw Number - HiLink masmFloat Number - - HiLink masmIdentifier Identifier - - syntax sync minlines=50 - - delcommand HiLink -endif +" The default highlighting +hi def link masmLabel PreProc +hi def link masmComment Comment +hi def link masmDirective Statement +hi def link masmType Type +hi def link masmOperator Type +hi def link masmOption Special +hi def link masmRegister Special +hi def link masmString String +hi def link masmText String +hi def link masmTitle Title +hi def link masmOpcode Statement +hi def link masmOpFloat Statement + +hi def link masmHexadecimal Number +hi def link masmDecimal Number +hi def link masmOctal Number +hi def link masmBinary Number +hi def link masmFloatRaw Number +hi def link masmFloat Number + +hi def link masmIdentifier Identifier + +syntax sync minlines=50 let b:current_syntax = "masm" diff --git a/runtime/syntax/mix.vim b/runtime/syntax/mix.vim new file mode 100644 index 000000000..9ab98eacf --- /dev/null +++ b/runtime/syntax/mix.vim @@ -0,0 +1,83 @@ +" Vim syntax file +" Language: MIX (Donald Knuth's assembly language used in TAOCP) +" Maintainer: Wu Yongwei <wuyongwei@gmail.com> +" Filenames: *.mixal *.mix +" Last Change: 2013 Nov 13 + +" Quit when a syntax file was already loaded +if exists("b:current_syntax") + finish +endif + +let s:cpo_save = &cpo +set cpo&vim + +syn case ignore + +" Special processing of ALF directive: implementations vary whether quotation +" marks are needed +syn match mixAlfParam #\s\{1,2\}"\?[^"]\{,5\}"\?# contains=mixAlfDirective,mixString nextgroup=mixEndComment contained + +" Region for parameters +syn match mixParam #[-+*/:=0-9a-z,()"]\+# contains=mixIdentifier,mixSpecial,mixNumber,mixString,mixLabel nextgroup=mixEndComment contained + +" Comment at the line end +syn match mixEndComment ".*" contains=mixRegister contained + +" Identifier; must go before literals +syn match mixIdentifier "[a-z0-9_]\+" contained + +" Literals +syn match mixSpecial "[-+*/:=]" contained +syn match mixNumber "[0-9]\+\>" contained +syn region mixString start=+"+ skip=+\\"+ end=+"+ contained + +" Labels +syn match mixLabel "^[a-z0-9_]\{,10\}\s\+" nextgroup=mixAlfSpecial,mixOpcode,mixDirective +syn match mixLabel "[0-9][BF]" contained + +" Comments +syn match mixComment "^\*.*" contains=mixRegister + +" Directives +syn keyword mixDirective ORIG EQU CON END nextgroup=mixParam contained skipwhite +syn keyword mixDirective ALF nextgroup=mixAlfParam contained + +" Opcodes +syn keyword mixOpcode NOP HLT NUM CHAR FLOT FIX nextgroup=mixEndComment contained +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 + +syn match mixOpcode "LD[AX1-6]N\?\>" nextgroup=mixParam contained skipwhite +syn match mixOpcode "ST[AX1-6JZ]\>" nextgroup=mixParam contained skipwhite +syn match mixOpcode "EN[TN][AX1-6]\>" nextgroup=mixParam contained skipwhite +syn match mixOpcode "INC[AX1-6]\>" nextgroup=mixParam contained skipwhite +syn match mixOpcode "DEC[AX1-6]\>" nextgroup=mixParam contained skipwhite +syn match mixOpcode "CMP[AX1-6]\>" nextgroup=mixParam contained skipwhite +syn match mixOpcode "J[AX1-6]N\?[NZP]\>" nextgroup=mixParam contained skipwhite + +" Switch back to being case sensitive +syn case match + +" Registers (only to used in comments now) +syn keyword mixRegister rA rX rI1 rI2 rI3 rI4 rI5 rI6 rJ contained + +" The default highlighting +hi def link mixRegister Special +hi def link mixLabel Define +hi def link mixComment Comment +hi def link mixEndComment Comment +hi def link mixDirective Keyword +hi def link mixOpcode Keyword + +hi def link mixSpecial Special +hi def link mixNumber Number +hi def link mixString String +hi def link mixAlfParam String +hi def link mixIdentifier Identifier + +let b:current_syntax = "mix" + +let &cpo = s:cpo_save +unlet s:cpo_save + +" vim: ts=8 diff --git a/runtime/tutor/tutor.it b/runtime/tutor/tutor.it index 69e83eb03..8fd13268f 100644 --- a/runtime/tutor/tutor.it +++ b/runtime/tutor/tutor.it @@ -638,7 +638,7 @@ NOTA: Tutti i comandi : devono essere terminati premendo <INVIO> NOTA: Se esci da Vim e riesegui Vim battendo vim TEST , il file aperto sarà una copia esatta di "tutor.it" al momento del salvataggio. - 5. Ora cancella il file battendo (MR-DOS): :!del TEST + 5. Ora cancella il file battendo (MS-DOS): :!del TEST o (Unix): :!rm TEST diff --git a/runtime/tutor/tutor.it.utf-8 b/runtime/tutor/tutor.it.utf-8 index bee3f6d8f..076aac3e6 100644 --- a/runtime/tutor/tutor.it.utf-8 +++ b/runtime/tutor/tutor.it.utf-8 @@ -638,7 +638,7 @@ NOTA: Tutti i comandi : devono essere terminati premendo <INVIO> NOTA: Se esci da Vim e riesegui Vim battendo vim TEST , il file aperto sarà una copia esatta di "tutor.it" al momento del salvataggio. - 5. Ora cancella il file battendo (MR-DOS): :!del TEST + 5. Ora cancella il file battendo (MS-DOS): :!del TEST o (Unix): :!rm TEST |