# HG changeset patch # User Steve Losh # Date 1468343464 0 # Node ID c0b7ab63d895c12cecb9b61af78363e83ca3aee5 # Parent a1d25734af30b5c8bf1ac9e0486a7ec3f8064d72 More diff -r a1d25734af30 -r c0b7ab63d895 fish/functions/dump.fish --- a/fish/functions/dump.fish Sat Jul 02 17:20:55 2016 +0000 +++ b/fish/functions/dump.fish Tue Jul 12 17:11:04 2016 +0000 @@ -2,6 +2,8 @@ hg -R ~/.plan push hg -R ~/.plan push git + hg -R ~/src/cl-nrepl push + hg -R ~/src/bones push hg -R ~/src/bones push git @@ -9,6 +11,11 @@ hg -R ~/src/mazes push git hg -R ~/src/coding-math push + hg -R ~/src/coding-math push git + + hg -R ~/src/sand push + + hg -R ~/src/hype push hg -R ~/lib/dotfiles push diff -r a1d25734af30 -r c0b7ab63d895 lispwords --- a/lispwords Sat Jul 02 17:20:55 2016 +0000 +++ b/lispwords Tue Jul 12 17:11:04 2016 +0000 @@ -2,6 +2,7 @@ (1 if) (-1 loop) (2 defmethod) +(2 define-compiler-macro) (2 with-accessors) (0 :use :export :documentation) (1 :shadowing-import-from :import-from) @@ -9,6 +10,7 @@ (1 print-unreadable-object) (1 pprint-logical-block) (2 defmacro) +(1 multiple-value-call) ; maybe not... ; my own weird things (1 make-array) diff -r a1d25734af30 -r c0b7ab63d895 roswell/lispindent.ros --- a/roswell/lispindent.ros Sat Jul 02 17:20:55 2016 +0000 +++ b/roswell/lispindent.ros Tue Jul 12 17:11:04 2016 +0000 @@ -32,7 +32,7 @@ (defvar *lisp-keywords* '()) (defvar *labels-keywords* '(labels flet macrolet)) -(defvar *lambda-list-keywords* '(defun defmethod defmacro)) +(defvar *lambda-list-keywords* '(defun defmethod defmacro define-compiler-macro defun*)) (defvar *case-keywords* '(cond case)) diff -r a1d25734af30 -r c0b7ab63d895 vim/bundle/ooze/plugin/ooze.vim --- a/vim/bundle/ooze/plugin/ooze.vim Sat Jul 02 17:20:55 2016 +0000 +++ b/vim/bundle/ooze/plugin/ooze.vim Tue Jul 12 17:11:04 2016 +0000 @@ -1,7 +1,6 @@ " TODO: " fix showmode awfulness " Disassembly mapping -" in-package horseshit " error handling " multi-packet messages " @@ -127,15 +126,24 @@ let g:ooze_connection = 0 endif endfunction " }}} -function! OozeConnect() " {{{ +function! OozeConnectToPort(port) " {{{ if g:ooze_connection call OozeDisconnect() endif - let g:ooze_connection = jobstart(['nc', 'localhost', '8675'], s:callbacks) + let g:ooze_connection = jobstart(['nc', 'localhost', a:port], s:callbacks) +endfunction " }}} +function! OozeConnect() " {{{ + call OozeConnectToPort('8675') endfunction " }}} function! OozeMacroexpand(form) " {{{ let msg = {"op": "macroexpand", "form": a:form} + + let package = s:FindPackage() + if package != "" + let msg["in-package"] = package + endif + call OozeSendMessage(msg) endfunction " }}} function! OozeMacroexpandSelection() " {{{ @@ -147,6 +155,12 @@ function! OozeDocument(symbol) " {{{ let msg = {"op": "documentation", "symbol": a:symbol} + + let package = s:FindPackage() + if package != "" + let msg["in-package"] = package + endif + call OozeSendMessage(msg) endfunction " }}} function! OozeDocumentSelection() " {{{ @@ -167,6 +181,12 @@ return endif let msg = {"op": "arglist", "symbol": a:symbol} + + let package = s:FindPackage() + if package != "" + let msg["in-package"] = package + endif + set noshowmode call OozeSendMessage(msg) endfunction " }}} diff -r a1d25734af30 -r c0b7ab63d895 vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Sat Jul 02 17:20:55 2016 +0000 +++ b/vim/custom-dictionary.utf-8.add Tue Jul 12 17:11:04 2016 +0000 @@ -181,3 +181,16 @@ Prolog REPL handwaved +OpenGL +fixnum +arity +fixnums +SBCL +CCL +bytecode +WAM +GPU +GLSL +GC +GGP +GDC diff -r a1d25734af30 -r c0b7ab63d895 vim/vimrc --- a/vim/vimrc Sat Jul 02 17:20:55 2016 +0000 +++ b/vim/vimrc Tue Jul 12 17:11:04 2016 +0000 @@ -1049,6 +1049,7 @@ au! au BufNewFile,BufRead *.asd,*.ros set filetype=lisp + au BufNewFile,BufRead *.paren set filetype=lisp au FileType lisp call SetLispWords() @@ -1437,6 +1438,8 @@ au BufNewFile,BufRead *.m*down setlocal filetype=markdown foldlevel=1 + au Filetype markdown set spell + " Use 1/2/3 to add headings. au Filetype markdown nnoremap 1 yypVr=:redraw au Filetype markdown nnoremap 2 yypVr-:redraw