7452a4fd1499

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Sat, 20 Apr 2019 13:18:03 -0400
parents aa1cc443308a (diff) 994750f7b6dd (current diff)
children 4a5c3d4626d4
branches/tags (none)
files vim/vimrc

Changes

--- a/lispwords	Thu Apr 18 14:48:52 2019 -0400
+++ b/lispwords	Sat Apr 20 13:18:03 2019 -0400
@@ -123,3 +123,7 @@
 (1 make-option)
 
 
+; makerlisp
+(1 if-lets)
+(1 lets)
+(1 macro)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/ftplugin/makerlisp/lispfolding.vim	Sat Apr 20 13:18:03 2019 -0400
@@ -0,0 +1,1 @@
+../lisp/lispfolding.vim
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/ftplugin/makerlisp/makerlisp.vim	Sat Apr 20 13:18:03 2019 -0400
@@ -0,0 +1,16 @@
+" Copy of the vanilla Lisp runtime file with some minor changes.
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:;
+setl define=^\\s*(def\\k*
+setl formatoptions-=t
+setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94
+setl lisp
+setl commentstring=;;\ %s
+
+setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|#
+
+let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp< commentstring<"
--- a/vim/vimrc	Thu Apr 18 14:48:52 2019 -0400
+++ b/vim/vimrc	Sat Apr 20 13:18:03 2019 -0400
@@ -1621,7 +1621,7 @@
     au!
 
     au BufNewFile,BufRead *.l set filetype=makerlisp
-    au BufNewFile,BufRead *.l setlocal syntax=lisp
+    au FileType makerlisp setlocal syntax=lisp sw=2
 
     au FileType makerlisp nnoremap <buffer> U :syntax sync fromstart<cr>:redraw!<cr>:call TurnOnLispFolding()<cr>
     au FileType makerlisp call SetLispWords()