Updated runtime files.

diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 1f7754b580d57974e0f61f82ceb5c76929eac464..749882ce4a375f68a0a1919737628fb8062a7c12 100644 (file)
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -598,7 +598,6 @@ without limits.
        " Default
        let g:clojure_maxlines = 100
 <
-
                                                *g:clojure_fuzzy_indent*
                                        *g:clojure_fuzzy_indent_patterns*
                                        *g:clojure_fuzzy_indent_blacklist*
@@ -652,7 +651,6 @@ default list below.
        let g:clojure_special_indent_words =
           \ 'deftype,defrecord,reify,proxy,extend-type,extend-protocol,letfn'
 <
-
                                        *g:clojure_align_multiline_strings*
 
 Align subsequent lines in multiline strings to the column after the opening
@@ -677,6 +675,28 @@ This option is off by default.
        " Default
        let g:clojure_align_multiline_strings = 0
 <
+                                               *g:clojure_align_subforms*
+
+By default, parenthesized compound forms that look like function calls and
+whose head subform is on its own line have subsequent subforms indented by
+two spaces relative to the opening paren:
+>
+       (foo
+         bar
+         baz)
+<
+Setting this option changes this behavior so that all subforms are aligned to
+the same column:
+>
+       (foo
+        bar
+        baz)
+<
+This option is off by default.
+>
+       " Default
+       let g:clojure_align_subforms = 0
+<
 
 
 FORTRAN                                                        *ft-fortran-indent*

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 7e8b5a8514579931bd43fb1aa2c057bcc5c24129..d95f21de682cbf1c705470e31a1bd51d91358ecb 100644 (file)
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2013 Dec 15
+*todo.txt*      For Vim version 7.4.  Last change: 2014 Jan 07
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -38,7 +38,16 @@ Article for Vim website. (Pritesh Ugrankar, 2013 Dec 13)
 
 Patch for Perl 5.18. (2013 Dec 13, Ken Takata)
 
+Patch 7.4.114 breaks "Entering directory" message parsing.
+patch by Lech Lorens, 2013 Dec 30.
+
+Patch to possibly fix crash usng w_localdir. (Dominique Pelle, 2013 Dec 27)
+
+Patch to fix crash when using :bwipeout in autocmd. (Hirohito Higashi, 2014 Jan 6)
+
 Regexp problems:
+- After patch 7.4.045 pattern with \zs isn't handled correctly. (Yukihiro
+  Nakadaira, 2013 Dec 23)
 - NFA regexp doesn't count tab matches correctly. (Urtica Dioica / gaultheria
   Shallon, 2013 Nov 18)
 - After patch 7.4.100 there is still a difference between NFA and old engine.
@@ -50,12 +59,34 @@ Regexp problems:
 - NFA problem with non-greedy match and branches. (Ingo Karkat, 2013 Nov 29)
 - Ignorecase not handled properly for multi-byte characters. (Axel Bender,
   2013 Dec 11)
+- Using \@> and \?. (Brett Stahlman, 2013 Dec 21) Remark from Marcin Szamotulski
 
 Problem that a previous silent ":throw" causes a following try/catch not to
 work. (ZyX, 2013 Sep 28)
 
+":cd C:\Windows\System32\drivers\etc*" does not work, even though the
+directory exists. (Sergio Gallelli, 2013 Dec 29)
+
 Patch for problems with Borland compiler. (Ken Takata, 2013 Dec 14)
 
+Patch to make getregtype() work as documented. (Yukihiro Nakadaira, 2013 Dec
+26)
+
+Patch to initialize v:oldfiles. (Yasuhiro Matsumoto, 2013 Dec 15)
+
+Patch to fix cursor movement. (Hirohito Higashi, 2013 Dec 21)
+
+Patch to add more help tags. (glts, 2014 Jan 4)
+
+Patch to avoid E685 internal error. (Yukihiro Nakadaira, 2014 Jan 1)
+Restore no_autoload?
+Alternative: Avoid no_autoload. (ZyX, 2014 Jan 6)
+
+Patch to avoid that :keeppatterns s/foo/bar sets @/. (Yasuhiro Matsumoto, 2013
+Dec 17)
+
+Patch for typo in makefile. ZyX, (2013 Dec 15)
+
 Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
 
 Update for Clojure ftplugin. (Sung Pae).  Await discussion about formatting in
@@ -70,6 +101,8 @@ Patch to support iterator on Python vim.options. (ZyX, 2013 Nov 2)
 Patch to make Dictionary.update() work without arguments.
 (ZyX, 2013 Oct 19)
 
+Patch to allow more types in remote_expr(). (Lech Lorens, 2014 Jan 5)
+
 Patch for Cobol ftplugin. (ZyX, 2013 Oct 20)
 Await response from maintainer.
 
@@ -85,6 +118,10 @@ 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?
 
+8   non-ASCII font names don't work.  Need to convert from 'encoding' and use
+    the wide functions. Patch by Ken Takata, 2013 Dec 22.
+    Update 2014 Jan 6.
+
 Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21)
 
 Adding "~" to 'cdpath' doesn't work for completion?  (Davido, 2013 Aug 19)
@@ -103,6 +140,9 @@ instead. (Samuel Ferencik, 2013 Sep 28)
 
 Series of patches for NL vs NUL handling. (ZyX, 2013 Nov 3, Nov 9)
 
+Patch to add flag to shortmess to avoid giving completion messages.
+(Shougo Matsu, 2014 Jan 6)
+
 Patch to add v:completed_item. (Shougo Matsu, 2013 Nov 29).
 
 Patch to make test 100 work on MS-Windows. (Taro Muraoka, 2013 Dec 12)
@@ -146,7 +186,8 @@ Patch by Thomas Tuegel, also for GTK, 2013 Nov 24
 :help gives example for z?, but it does not work.  m? and t? do work.
 
 Python: Extended funcrefs: use func_T* structure in place of char_u* function
-names. (ZyX, 2013 Jul 15, update Sep 22, 24, 28)
+names.
+(ZyX, 2013 Jul 15, update Sep 22, 24, 28; Update 2013 Dec 15, 2014 Jan 6)
 Also fixes Bug: E685 error for func_unref(). (ZyX, 2010 Aug 5)
 
 Patch to add funcref to Lua.  (Luis Carvalho, 2013 Sep 4)
@@ -2012,8 +2053,6 @@ GTK+ GUI known bugs:
 Win32 GUI known bugs:
 -   Win32: tearoff menu window should have a scrollbar when it's taller than
     the screen.
-8   non-ASCII font names don't work.  Need to convert from 'encoding' and use
-    the wide functions.
 8   On Windows 98 the unicows library is needed to support functions with UCS2
     file names.  Can we load unicows.dll dynamically?
 8   The -P argument doesn't work very well with many MDI applications.

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 20775e9d21c96d730bb4526a28c4b858b7487f67..88d2620139fe3b80c84a08754fa6628cd773e9c0 100644 (file)
--- 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 Nov 13
+" Last Change: 2014 Jan 06
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -106,6 +106,9 @@ au BufNewFile,BufRead *.run                 setf ampl
 " Ant
 au BufNewFile,BufRead build.xml                        setf ant
 
+" Arduino
+au BufNewFile,BufRead *.ino,*.pde              setf arduino
+
 " Apache style config file
 au BufNewFile,BufRead proftpd.conf*            call s:StarSetf('apachestyle')
 

diff --git a/runtime/indent/clojure.vim b/runtime/indent/clojure.vim
index 7d0c2aa91f13f8895c04d1824f08f1663f2a61fc..df88cea94245d874668e6be5472091530deaf734 100644 (file)
--- a/runtime/indent/clojure.vim
+++ b/runtime/indent/clojure.vim
@@ -6,7 +6,7 @@
 " Maintainer:  Sung Pae <self@sungpae.com>
 " URL:         https://github.com/guns/vim-clojure-static
 " License:     Same as Vim
-" Last Change: 08 September 2013
+" Last Change: 16 December 2013
 
 " TODO: Indenting after multibyte characters is broken:
 "       (let [Δ (if foo
@@ -53,6 +53,10 @@ if exists("*searchpairpos")
                let g:clojure_align_multiline_strings = 0
        endif
 
+       if !exists('g:clojure_align_subforms')
+               let g:clojure_align_subforms = 0
+       endif
+
        function! s:SynIdName()
                return synIDattr(synID(line("."), col("."), 0), "name")
        endfunction
@@ -284,7 +288,7 @@ if exists("*searchpairpos")
                call search('\v\_s', 'cW')
                call search('\v\S', 'W')
                if paren[0] < line(".")
-                       return paren[1] + &shiftwidth - 1
+                       return paren[1] + (g:clojure_align_subforms ? 0 : &shiftwidth - 1)
                endif
 
                call search('\v\S', 'bW')

diff --git a/runtime/syntax/a65.vim b/runtime/syntax/a65.vim
index dbf1cdb46d5870f20e7cc9a24aa202832a7ebac9..94198e6a422ba366816a41d6d6693d6124f05776 100644 (file)
--- a/runtime/syntax/a65.vim
+++ b/runtime/syntax/a65.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:    xa 6502 cross assembler
-" Maintainer:  Clemens Kirchgatterer <clemens@thf.ath.cx>
-" Last Change: 2003 May 03
+" Maintainer:  Clemens Kirchgatterer <clemens@1541.org>
+" Last Change: 2014 Jan 05
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded

diff --git a/runtime/syntax/arduino.vim b/runtime/syntax/arduino.vim
new file mode 100644 (file)
index 0000000..14299a4
--- /dev/null
+++ b/runtime/syntax/arduino.vim
@@ -0,0 +1,61 @@
+" Vim syntax file
+" Language:    Arduino
+" Maintainer:  Johannes Hoff <johannes@johanneshoff.com>
+" Last Change: 2011 June 3
+" License:     VIM license (:help license, replace vim by arduino.vim)
+
+" Syntax highlighting like in the Arduino IDE
+" Keywords extracted from <arduino>/build/shared/lib/keywords.txt (arduino
+" version 0021)
+
+" Thanks to Rik, Erik Nomitch, Adam Obeng and Graeme Cross for helpful feedback!
+
+" 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")
+  finish
+endif
+
+" Read the C syntax to start with
+if version < 600
+  so <sfile>:p:h/cpp.vim
+else
+  runtime! syntax/cpp.vim
+endif
+
+syn keyword arduinoConstant HIGH LOW INPUT OUTPUT
+syn keyword arduinoConstant DEC BIN HEX OCT BYTE
+syn keyword arduinoConstant PI HALF_PI TWO_PI
+syn keyword arduinoConstant LSBFIRST MSBFIRST 
+syn keyword arduinoConstant CHANGE FALLING RISING 
+syn keyword arduinoConstant SERIAL DISPLAY
+syn keyword arduinoConstant DEFAULT EXTERNAL INTERNAL INTERNAL1V1 INTERNAL2V56
+
+syn keyword arduinoStdFunc abs acos asin atan atan2 ceil constrain
+syn keyword arduinoStdFunc cos degrees exp floor log
+syn keyword arduinoStdFunc map max min pow radians 
+syn keyword arduinoStdFunc round sin sq sqrt tan
+syn keyword arduinoStdFunc randomSeed random
+
+syn keyword arduinoFunc analogReference analogRead analogWrite 
+syn keyword arduinoFunc attachInterrupt detachInterrupt interrupts noInterrupts 
+syn keyword arduinoFunc lowByte highByte bitRead bitWrite bitSet bitClear
+syn keyword arduinoFunc millis micros delay delayMicroseconds 
+syn keyword arduinoFunc pinMode digitalWrite digitalRead 
+syn keyword arduinoFunc tone noTone pulseIn shiftOut 
+
+syn keyword arduinoMethod setup loop
+syn keyword arduinoMethod begin end available read flush print println write peek
+
+syn keyword arduinoType boolean byte word String 
+
+syn keyword arduinoModule Serial Serial1 Serial2 Serial3
+
+hi def link arduinoType Type
+hi def link arduinoConstant Constant
+hi def link arduinoStdFunc Function
+hi def link arduinoFunc Function
+hi def link arduinoMethod Function
+hi def link arduinoModule Identifier

diff --git a/runtime/syntax/clojure.vim b/runtime/syntax/clojure.vim
index 09b8b1dd68dae7bc5f2c075ac4a5ddd4fe0dbfeb..69117ff90c433a674fc06cf51b7f05d971948066 100644 (file)
--- a/runtime/syntax/clojure.vim
+++ b/runtime/syntax/clojure.vim
@@ -9,13 +9,13 @@
 " Maintainer:  Sung Pae <self@sungpae.com>
 " URL:         https://github.com/guns/vim-clojure-static
 " License:     Same as Vim
-" Last Change: 08 September 2013
+" Last Change: 16 December 2013
 
 if exists("b:current_syntax")
        finish
 endif
 
-" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-005/clj/src/vim_clojure_static/generate.clj
+" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-007/clj/src/vim_clojure_static/generate.clj
 " Clojure version 1.5.1
 syntax keyword clojureConstant nil
 syntax keyword clojureBoolean false true
@@ -38,7 +38,7 @@ syntax match clojureKeyword "\v<:{1,2}%([^ \n\r\t()\[\]{}";@^`~\\%/]+/)*[^ \n\r\
 
 syntax match clojureStringEscape "\v\\%([\\btnfr"]|u\x{4}|[0-3]\o{2}|\o{1,2})" contained
 
-syntax region clojureString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=clojureStringEscape
+syntax region clojureString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=clojureStringEscape,@Spell
 
 syntax match clojureCharacter "\\."
 syntax match clojureCharacter "\\o\%([0-3]\o\{2\}\|\o\{1,2\}\)"
@@ -75,12 +75,12 @@ syntax match clojureDispatch "\v#[\^'=<_]?"
 " Clojure permits no more than 20 params.
 syntax match clojureAnonArg "%\(20\|1\d\|[1-9]\|&\)\?"
 
-syntax match  clojureRegexpEscape "\v\\%([\\tnrfae()\[\]{}^$*?+]|c\u|0[0-3]?\o{1,2}|x%(\x{2}|\{\x{1,6}\})|u\x{4})" contained display
+syntax match  clojureRegexpEscape "\v\\%([\\tnrfae.()\[\]{}^$*?+]|c\u|0[0-3]?\o{1,2}|x%(\x{2}|\{\x{1,6}\})|u\x{4})" contained display
 syntax region clojureRegexpQuoted start=/\\Q/ms=e+1 skip=/\\\\\|\\"/ end=/\\E/me=s-1 end=/"/me=s-1 contained
 syntax region clojureRegexpQuote  start=/\\Q/       skip=/\\\\\|\\"/ end=/\\E/       end=/"/me=s-1 contains=clojureRegexpQuoted keepend contained
 
 " Character property classes
-" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-005/clj/src/vim_clojure_static/generate.clj
+" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-007/clj/src/vim_clojure_static/generate.clj
 " Java version 1.7.0_40
 syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Blank|P%(unct|rint)|Digit|Graph|A%(l%(pha|num)|SCII)|XDigit|Space|Upper|Lower|Cntrl)\}" contained display
 syntax match clojureRegexpJavaCharClass "\v\\[pP]\{java%(U%(pperCase|nicodeIdentifier%(Start|Part))|Mirrored|Alphabetic|SpaceChar|D%(efined|igit)|Whitespace|L%(etter%(OrDigit)?|owerCase)|TitleCase|I%(de%(ographic|ntifierIgnorable)|SOControl)|JavaIdentifier%(Start|Part))\}" contained display
@@ -91,23 +91,23 @@ syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(Is|gc\=|general_category
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(Is|sc\=|script\=)%(h%(ira%(gana)?|an%([io]|g%(ul)?|unoo)?|ebr%(ew)?)|yi%(ii)?|java%(nese)?|c%(prt|y%(r%(illic|l)|priot)|h%(er%(okee)?|am)|uneiform|o%(mmon|pt%(ic)?)|a%(n%(adian_aboriginal|s)|ri%(an)?))|i%(mperial_aramaic|tal|n%(herited|scriptional_pa%(rthian|hlavi)))|a%(r%(ab%(ic)?|m%([in]|enian))|v%(st|estan))|g%(oth%(ic)?|u%(j%(arati|r)|r%(mukhi|u))|lag%(olitic)?|eor%(gian)?|re%(k|ek))|b%(u%(gi%(nese)?|h%(d|id))|ra%(i%(lle)?|h%(mi)?)|a%(mum?|t%(k|ak)|li%(nese)?)|opo%(mofo)?|eng%(ali)?)|s%(ha%(w|vian)|und%(anese)?|y%(r%(iac|c)|lo%(ti_nagri)?)|inh%(ala)?|a%(ur%(ashtra)?|rb|m%(r|aritan)))|d%(srt|e%(va%(nagari)?|seret))|l%(a%(na|oo?|t%(n|in))|epc%(ha)?|i%(n%(ear_b|b)|mbu?|su)|y%([dc]i%(an)?))|p%(h%(oenician|nx|li|ag%(s_pa)?)|rti)|e%(gyp%(tian_hieroglyphs)?|thi%(opic)?)|r%(jng|un%(ic|r)|ejang)|u%(nknown|gar%(itic)?)|vaii?|n%(koo?|ew_tai_lue)|m%(y%(mr|anmar)|tei|a%(nd%(aic)?|layalam)|ong%(olian)?|eetei_mayek|lym)|z%(inh|yyy|zzz)|t%(glg|fng|i%(finagh|b%(t|etan))|ha%(i|a%(na)?)|elu%(gu)?|a%(i_%(viet|le|tham)|l[eu]|g%(alog|b%(anwa)?)|vt|m%(l|il)))|x%(sux|peo)|o%(r%(iya|kh|ya)|sma%(nya)?|g%(am|ham)|l%(ck|d_%(south_arabian|turkic|italic|persian)|_chiki))|k%(a%(takana|yah_li|n%(nada|a)|li|ithi)|h%(m%(r|er)|ar%(oshthi)?)|thi|nda))\}" contained display
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(In|blk\=|block\=)%(s%(a%(maritan|urashtra)|mall%(_form_variants| form variants|formvariants)|inhala|y%(loti%(nagri|[_ ]nagri)|riac)|havian|p%(ecials|acing%(modifierletters|_modifier_letters| modifier letters))|u%(p%(erscripts%(andsubscripts|_and_subscripts| and subscripts)|plementa%(ry%( private use area-[ab]|_private_use_area_[ab]|privateusearea-[ab])|l%( %(arrows-[ab]|punctuation|mathematical operators)|arrows-[ab]|_%(punctuation|mathematical_operators|arrows_[ab])|punctuation|mathematicaloperators)))|ndanese|rrogates_area))|l%(a%(o|tin%(_%(extended_%(a%(dditional)?|[dcb])|1_supplement)| extended%(-[dacb]| additional)|-1%( supplement|supplement)|extended%(additional|-[dacb])))|e%(pcha|tterlike%(symbols|[_ ]symbols))|y[cd]ian|i%(su|mbu|near%(b%(ideograms|syllabary)|_b_%(ideograms|syllabary)| b %(ideograms|syllabary)))|ow%([_ ]surrogates|surrogates))|b%(a%(sic%(latin|[_ ]latin)|tak|linese|mum%([_ ]supplement|supplement)?)|yzantine%(_musical_symbols| musical symbols|musicalsymbols)|engali|u%(ginese|hid)|lock%(elements|[_ ]elements)|ra%(hmi|ille%([ _]patterns|patterns))|o%(x%(drawing|[_ ]drawing)|pomofo%([ _]extended|extended)?))|t%(a%(g%(s|alog|banwa)|mil|i%( %(viet|xuan jing symbols|le|tham)|viet|le|_%(xuan_jing_symbols|viet|le|tham)|tham|xuanjingsymbols))|ha%(i|ana)|elugu|i%(finagh|betan)|ransport%(_and_map_symbols| and map symbols|andmapsymbols))|n%(ew%(_tai_lue| tai lue|tailue)|umber%([ _]forms|forms)|ko)|m%(iscellaneous%(_%(mathematical_symbols_[ab]|symbols%(_and_%(arrows|pictographs))?|technical)|mathematicalsymbols-[ab]|technical| %(symbols%( and %(arrows|pictographs))?|mathematical symbols-[ab]|technical)|symbols%(and%(arrows|pictographs))?)|eetei%(mayek|[_ ]mayek)|a%(ndaic|thematical%(alphanumericsymbols|operators|_%(alphanumeric_symbols|operators)| %(operators|alphanumeric symbols))|hjong%(tiles|[_ ]tiles)|layalam)|yanmar%(_extended_a|extended-a| extended-a)?|o%(difier%( tone letters|toneletters|_tone_letters)|ngolian)|usical%(symbols|[_ ]symbols))|p%(h%(a%(gs[-_]pa|istos%(disc|[_ ]disc))|o%(netic%(_extensions%(_supplement)?| extensions%( supplement)?|extensions%(supplement)?)|enician))|rivate%(usearea|_use_area| use area)|laying%(cards|[_ ]cards))|javanese|u%(garitic|nified%(_canadian_aboriginal_syllabics%(_extended)?| canadian aboriginal syllabics%( extended)?|canadianaboriginalsyllabics%(extended)?))|o%(riya|gham|l%([ _]chiki|d%(turkic|_%(south_arabian|turkic|italic|persian)|italic|persian| %(south arabian|turkic|italic|persian)|southarabian)|chiki)|smanya|ptical%(_character_recognition| character recognition|characterrecognition))|v%(e%(dic%(extensions|[_ ]extensions)|rtical%([ _]forms|forms))|a%(i|riation%(_selectors%(_supplement)?| selectors%( supplement)?|selectors%(supplement)?)))|a%(vestan|l%(phabetic%(_presentation_forms| presentation forms|presentationforms)|chemical%(symbols|[_ ]symbols))|ncient%( %(symbols|greek %(musical notation|numbers))|symbols|greek%(musicalnotation|numbers)|_%(symbols|greek_%(musical_notation|numbers)))|egean%([ _]numbers|numbers)|r%(menian|rows|abic%( %(presentation forms-[ab]|supplement)|_%(presentation_forms_[ab]|supplement)|presentationforms-[ab]|supplement)?))|i%(nscriptional%(pa%(rthian|hlavi)|%([_ ]pa%(rthian|hlavi)))|deographic%( description characters|descriptioncharacters|_description_characters)|pa%(extensions|[_ ]extensions)|mperial%(aramaic|[_ ]aramaic))|yi%(%([_ ]%(radicals|syllables))|radicals|syllables|jing%(hexagramsymbols|_hexagram_symbols| hexagram symbols))|k%(a%(yah%(li|[_ ]li)|n%(nada|bun|a%([_ ]supplement|supplement)|gxi%(radicals|[_ ]radicals))|ithi|takana%(phoneticextensions|_phonetic_extensions| phonetic extensions)?)|h%(aroshthi|mer%(symbols|[_ ]symbols)?))|d%(e%(vanagari%([ _]extended|extended)?|seret)|omino%(tiles|[_ ]tiles)|ingbats)|g%(lagolitic|othic|reek%(andcoptic| %(and coptic|extended)|extended|_extended)?|u%(rmukhi|jarati)|e%(o%(metric%([_ ]shapes|shapes)|rgian%([_ ]supplement|supplement)?)|neral%(punctuation|[_ ]punctuation)))|e%(nclosed%( %(ideographic supplement|cjk letters and months|alphanumeric%( supplement|s))|cjklettersandmonths|_%(ideographic_supplement|alphanumeric%(_supplement|s)|cjk_letters_and_months)|alphanumerics%(upplement)?|ideographicsupplement)|moticons|thiopic%(extended%(-a)?| %(extended%(-a)?|supplement)|_%(extended%(_a)?|supplement)|supplement)?|gyptian%(hieroglyphs|[_ ]hieroglyphs))|r%(ejang|u%(nic|mi%(numeralsymbols|_numeral_symbols| numeral symbols)))|c%(jk%(_%(compatibility%(_%(ideographs%(_supplement)?|forms))?|radicals_supplement|unified_ideographs%(_extension_[dacb])?|s%(trokes|ymbols_and_punctuation))|compatibility%(ideographs%(supplement)?|forms)?|unifiedideographs%(extension[dacb])?|radicalssupplement|s%(ymbolsandpunctuation|trokes)| %(unified ideographs%( extension [dacb])?|s%(trokes|ymbols and punctuation)|radicals supplement|compatibility%( %(forms|ideographs%( supplement)?))?))|h%(am|erokee)|u%(neiform%(_numbers_and_punctuation| numbers and punctuation|numbersandpunctuation)?|rrency%(symbols|[_ ]symbols))|y%(rillic%(_%(extended_[ab]|supplementary)| %(extended-[ab]|supplement%(ary)?)|extended-[ab]|supplement%(ary)?)?|priot%([_ ]syllabary|syllabary))|o%(ntrol%(pictures|[_ ]pictures)|unting%(rodnumerals|_rod_numerals| rod numerals)|m%(bining%(halfmarks|diacriticalmarks%(forsymbols|supplement)?| %(marks for symbols|half marks|diacritical marks%( %(for symbols|supplement))?)|marksforsymbols|_%(marks_for_symbols|half_marks|diacritical_marks%(_supplement)?))|mon%( indic number forms|indicnumberforms|_indic_number_forms))|ptic)|arian)|h%(i%(ragana|gh%(_%(private_use_surrogates|surrogates)| %(private use surrogates|surrogates)|surrogates|privateusesurrogates))|ebrew|a%(n%(unoo|gul%(jamo%(extended-[ab])?| %(jamo%( extended-[ab])?|syllables|compatibility jamo)|_%(syllables|jamo%(_extended_[ab])?|compatibility_jamo)|syllables|compatibilityjamo))|lfwidth%( and fullwidth forms|andfullwidthforms|_and_fullwidth_forms))))\}" contained display
 
-syntax match   clojureRegexpPredefinedCharClass "\v%(\\[dDsSwW]|\.)" contained display
-syntax cluster clojureRegexpCharPropertyClasses contains=clojureRegexpPosixCharClass,clojureRegexpJavaCharClass,clojureRegexpUnicodeCharClass
-syntax cluster clojureRegexpCharClasses         contains=clojureRegexpPredefinedCharClass,clojureRegexpCharClass,@clojureRegexpCharPropertyClasses
-syntax region  clojureRegexpCharClass           start="\[" skip=/\\\\\|\\]/ end="]" contained contains=clojureRegexpPredefinedCharClass,@clojureRegexpCharPropertyClasses
-syntax match   clojureRegexpBoundary            "\\[bBAGZz]"                     contained display
-syntax match   clojureRegexpBoundary            "[$^]"                           contained display
-syntax match   clojureRegexpQuantifier          "[?*+][?+]\="                    contained display
-syntax match   clojureRegexpQuantifier          "\v\{\d+%(,|,\d+)?}\??"          contained display
-syntax match   clojureRegexpOr                  "|"                              contained display
-syntax match   clojureRegexpBackRef             "\v\\%([1-9]\d*|k\<[a-zA-z]+\>)" contained display
+syntax match   clojureRegexpPredefinedCharClass        "\v%(\\[dDsSwW]|\.)" contained display
+syntax cluster clojureRegexpCharPropertyClasses        contains=clojureRegexpPosixCharClass,clojureRegexpJavaCharClass,clojureRegexpUnicodeCharClass
+syntax cluster clojureRegexpCharClasses                contains=clojureRegexpPredefinedCharClass,clojureRegexpCharClass,@clojureRegexpCharPropertyClasses
+syntax region  clojureRegexpCharClass          start="\[" skip=/\\\\\|\\]/ end="]" contained contains=clojureRegexpPredefinedCharClass,@clojureRegexpCharPropertyClasses
+syntax match   clojureRegexpBoundary           "\\[bBAGZz]" contained display
+syntax match   clojureRegexpBoundary           "[$^]" contained display
+syntax match   clojureRegexpQuantifier         "[?*+][?+]\=" contained display
+syntax match   clojureRegexpQuantifier         "\v\{\d+%(,|,\d+)?}\??" contained display
+syntax match   clojureRegexpOr                 "|" contained display
+syntax match   clojureRegexpBackRef            "\v\\%([1-9]\d*|k\<[a-zA-z]+\>)" contained display
 
 " Mode modifiers, mode-modified spans, lookaround, regular and atomic
 " grouping, and named-capturing.
-syntax match clojureRegexpMod "\v\(@<=\?:"                        contained display
+syntax match clojureRegexpMod "\v\(@<=\?:" contained display
 syntax match clojureRegexpMod "\v\(@<=\?[xdsmiuU]*-?[xdsmiuU]+:?" contained display
-syntax match clojureRegexpMod "\v\(@<=\?%(\<?[=!]|\>)"            contained display
-syntax match clojureRegexpMod "\v\(@<=\?\<[a-zA-Z]+\>"            contained display
+syntax match clojureRegexpMod "\v\(@<=\?%(\<?[=!]|\>)" contained display
+syntax match clojureRegexpMod "\v\(@<=\?\<[a-zA-Z]+\>" contained display
 
 syntax region clojureRegexpGroup start="(" skip=/\\\\\|\\)/ end=")" matchgroup=clojureRegexpGroup contained contains=clojureRegexpMod,clojureRegexpQuantifier,clojureRegexpBoundary,clojureRegexpEscape,@clojureRegexpCharClasses
 syntax region clojureRegexp start=/\#"/ skip=/\\\\\|\\"/ end=/"/ contains=@clojureRegexpCharClasses,clojureRegexpEscape,clojureRegexpQuote,clojureRegexpBoundary,clojureRegexpQuantifier,clojureRegexpOr,clojureRegexpBackRef,clojureRegexpGroup keepend
@@ -126,13 +126,13 @@ syntax match clojureError "]\|}\|)"
 
 syntax sync fromstart
 
-highlight default link clojureConstant         Constant
-highlight default link clojureBoolean          Boolean
-highlight default link clojureCharacter                Character
-highlight default link clojureKeyword          Keyword
-highlight default link clojureNumber           Number
-highlight default link clojureString           String
-highlight default link clojureStringEscape     Character
+highlight default link clojureConstant                 Constant
+highlight default link clojureBoolean                  Boolean
+highlight default link clojureCharacter                        Character
+highlight default link clojureKeyword                  Keyword
+highlight default link clojureNumber                   Number
+highlight default link clojureString                   String
+highlight default link clojureStringEscape             Character
 
 highlight default link clojureRegexp                   Constant
 highlight default link clojureRegexpEscape             Character
@@ -150,29 +150,29 @@ highlight default link clojureRegexpGroup         clojureRegexp
 highlight default link clojureRegexpQuoted             clojureString
 highlight default link clojureRegexpQuote              clojureRegexpBoundary
 
-highlight default link clojureVariable Identifier
-highlight default link clojureCond     Conditional
-highlight default link clojureDefine   Define
-highlight default link clojureException        Exception
-highlight default link clojureFunc     Function
-highlight default link clojureMacro    Macro
-highlight default link clojureRepeat   Repeat
-
-highlight default link clojureSpecial  Special
-highlight default link clojureVarArg   Special
-highlight default link clojureQuote    SpecialChar
-highlight default link clojureUnquote  SpecialChar
-highlight default link clojureMeta     SpecialChar
-highlight default link clojureDeref    SpecialChar
-highlight default link clojureAnonArg  SpecialChar
-highlight default link clojureDispatch SpecialChar
-
-highlight default link clojureComment          Comment
-highlight default link clojureCommentTodo      Todo
-
-highlight default link clojureError    Error
-
-highlight default link clojureParen    Delimiter
+highlight default link clojureVariable                 Identifier
+highlight default link clojureCond                     Conditional
+highlight default link clojureDefine                   Define
+highlight default link clojureException                        Exception
+highlight default link clojureFunc                     Function
+highlight default link clojureMacro                    Macro
+highlight default link clojureRepeat                   Repeat
+
+highlight default link clojureSpecial                  Special
+highlight default link clojureVarArg                   Special
+highlight default link clojureQuote                    SpecialChar
+highlight default link clojureUnquote                  SpecialChar
+highlight default link clojureMeta                     SpecialChar
+highlight default link clojureDeref                    SpecialChar
+highlight default link clojureAnonArg                  SpecialChar
+highlight default link clojureDispatch                 SpecialChar
+
+highlight default link clojureComment                  Comment
+highlight default link clojureCommentTodo              Todo
+
+highlight default link clojureError                    Error
+
+highlight default link clojureParen                    Delimiter
 
 let b:current_syntax = "clojure"