# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1555900110 14400
# Node ID 4a5c3d4626d42733623b523f2b7f0af476515d9c
# Parent  62f9cb575c0f08e77e7beeedc8dbe027c2c3ca2e# Parent  7452a4fd1499d9d5a1975151510a42d0318848db
Merge.

diff -r 62f9cb575c0f -r 4a5c3d4626d4 lispwords
--- a/lispwords	Sun Apr 21 22:27:47 2019 -0400
+++ b/lispwords	Sun Apr 21 22:28:30 2019 -0400
@@ -123,3 +123,7 @@
 (1 make-option)
 
 
+; makerlisp
+(1 if-lets)
+(1 lets)
+(1 macro)
diff -r 62f9cb575c0f -r 4a5c3d4626d4 vim/ftplugin/makerlisp/lispfolding.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/ftplugin/makerlisp/lispfolding.vim	Sun Apr 21 22:28:30 2019 -0400
@@ -0,0 +1,1 @@
+../lisp/lispfolding.vim
\ No newline at end of file
diff -r 62f9cb575c0f -r 4a5c3d4626d4 vim/ftplugin/makerlisp/makerlisp.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/ftplugin/makerlisp/makerlisp.vim	Sun Apr 21 22:28:30 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<"
diff -r 62f9cb575c0f -r 4a5c3d4626d4 vim/vimrc
--- a/vim/vimrc	Sun Apr 21 22:27:47 2019 -0400
+++ b/vim/vimrc	Sun Apr 21 22:28:30 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()