prefer lispindent() to 'lisp' and add cpo to syntax file

vim · Jul 29, 2018 · c4555b5 · c4555b5
1 parent 9446e98
commit c4555b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/runtime/indent/wast.vim b/runtime/indent/wast.vim
@@ -10,7 +10,8 @@ endif
 let b:did_indent = 1
 
 " WebAssembly text format is S-expression. We can reuse LISP indentation
-setlocal lisp
-setlocal indentexpr=
+" logic.
+setlocal indentexpr=lispindent('.')
+setlocal noautoindent nosmartindent
 
 let b:undo_indent = "setl lisp< indentexpr<"
diff --git a/runtime/syntax/wast.vim b/runtime/syntax/wast.vim
@@ -8,6 +8,9 @@ if exists("b:current_syntax")
     finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 syn cluster wastCluster       contains=wastModule,wastInstWithType,wastInstGeneral,wastParamInst,wastControlInst,wastString,wastNamedVar,wastUnnamedVar,wastFloat,wastNumber,wastComment,wastList,wastType
 
 " Instructions
@@ -76,3 +79,6 @@ hi def link wastComment       Comment
 hi def link wastType          Type
 
 let b:current_syntax = "wast"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save