From c8cbfc2df05765987814f2c3340d7e143577c737 Mon Sep 17 00:00:00 2001 From: guns Date: Tue, 1 Oct 2013 16:12:36 -0500 Subject: [PATCH] Remove fo+=croql, add . to clojureRegexpEscape --- runtime/ftplugin/clojure.vim | 7 +++---- runtime/syntax/clojure.vim | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/runtime/ftplugin/clojure.vim b/runtime/ftplugin/clojure.vim index 2b935a5..5c2c908 100644 --- a/runtime/ftplugin/clojure.vim +++ b/runtime/ftplugin/clojure.vim @@ -5,7 +5,7 @@ " Maintainer: Sung Pae " URL: https://github.com/guns/vim-clojure-static " License: Same as Vim -" Last Change: 08 September 2013 +" Last Change: 01 October 2013 if exists("b:did_ftplugin") finish @@ -23,9 +23,8 @@ setlocal iskeyword+=?,-,*,!,+,/,=,<,>,.,:,$ " of user-defined def* definitions. setlocal define=\\v[(/]def(ault)@!\\S* -" Remove 't' from 'formatoptions' to avoid auto-wrapping code. The '+=croql' -" is standard ftplugin boilerplate, although it is arguably intrusive. -setlocal formatoptions-=t formatoptions+=croql +" Remove 't' from 'formatoptions' to avoid auto-wrapping code. +setlocal formatoptions-=t " Lisp comments are routinely nested (e.g. ;;; SECTION HEADING) setlocal comments=n:; diff --git a/runtime/syntax/clojure.vim b/runtime/syntax/clojure.vim index 09b8b1d..53f50b5 100644 --- a/runtime/syntax/clojure.vim +++ b/runtime/syntax/clojure.vim @@ -9,7 +9,7 @@ " Maintainer: Sung Pae " URL: https://github.com/guns/vim-clojure-static " License: Same as Vim -" Last Change: 08 September 2013 +" Last Change: 01 October 2013 if exists("b:current_syntax") finish @@ -75,7 +75,7 @@ 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 -- 1.8.4