From 8d743d02f229aeed600bbc9a15736ad9e7be9507 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 28 Oct 2018 13:59:07 +0100 Subject: [PATCH] vim-patch:df980db69b83 update a few runtime files https://github.com/vim/vim/commit/df980db69b831381c37c3e2973a6eefa10df305c Note: omit hl-Terminal, Nvim has its own way of highlighting :terminal. --- runtime/doc/options.txt | 10 +++++----- runtime/ftplugin/cmake.vim | 16 ++++++++++++++++ runtime/syntax/mix.vim | 7 ++++--- 3 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 runtime/ftplugin/cmake.vim diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index bfdc09662e..1d6bfd38fa 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4422,11 +4422,11 @@ A jump table for the options with a short description can be found at |Q_op|. copy of the original file will be kept. The name of the copy is the name of the original file with the string in the 'patchmode' option appended. This option should start with a dot. Use a string like - ".org". 'backupdir' must not be empty for this to work (Detail: The - backup file is renamed to the patchmode file after the new file has - been successfully written, that's why it must be possible to write a - backup file). If there was no file to be backed up, an empty file is - created. + ".orig" or ".org". 'backupdir' must not be empty for this to work + (Detail: The backup file is renamed to the patchmode file after the + new file has been successfully written, that's why it must be possible + to write a backup file). If there was no file to be backed up, an + empty file is created. When the 'backupskip' pattern matches, a patchmode file is not made. Using 'patchmode' for compressed files appends the extension at the end (e.g., "file.gz.orig"), thus the resulting name isn't always diff --git a/runtime/ftplugin/cmake.vim b/runtime/ftplugin/cmake.vim new file mode 100644 index 0000000000..e81cd4071c --- /dev/null +++ b/runtime/ftplugin/cmake.vim @@ -0,0 +1,16 @@ +" Vim filetype plugin +" Language: CMake +" Maintainer: Keith Smiley +" Last Change: 2017 Dec 24 + +" Only do this when not done yet for this buffer +if exists("b:did_ftplugin") + finish +endif + +" Don't load another plugin for this buffer +let b:did_ftplugin = 1 + +let b:undo_ftplugin = "setl commentstring<" + +setlocal commentstring=#\ %s diff --git a/runtime/syntax/mix.vim b/runtime/syntax/mix.vim index 9ab98eacf8..564d344cc8 100644 --- a/runtime/syntax/mix.vim +++ b/runtime/syntax/mix.vim @@ -2,7 +2,7 @@ " Language: MIX (Donald Knuth's assembly language used in TAOCP) " Maintainer: Wu Yongwei " Filenames: *.mixal *.mix -" Last Change: 2013 Nov 13 +" Last Change: 2017-11-26 15:21:36 +0800 " Quit when a syntax file was already loaded if exists("b:current_syntax") @@ -16,7 +16,7 @@ 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 +syn match mixAlfParam #\s\{1,2\}"\?[^"]\{,5\}"\?# contains=mixString nextgroup=mixEndComment contained " Region for parameters syn match mixParam #[-+*/:=0-9a-z,()"]\+# contains=mixIdentifier,mixSpecial,mixNumber,mixString,mixLabel nextgroup=mixEndComment contained @@ -46,6 +46,7 @@ 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 keyword mixOpcode SLB SRB JAE JAO JXE JXO 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 @@ -58,7 +59,7 @@ 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) +" Registers (only to be used in comments now) syn keyword mixRegister rA rX rI1 rI2 rI3 rI4 rI5 rI6 rJ contained " The default highlighting