--- a/.hgsubstate Wed Apr 20 17:18:27 2016 +0000
+++ b/.hgsubstate Wed May 04 11:24:25 2016 +0000
@@ -1,4 +1,4 @@
-5dc059aeb5f47dc86ef30821b8a8cdfbf10a4080 mercurial/hg-prompt
+e90cf5cad06061cd1691ab804eebfb0a25d3c16a mercurial/hg-prompt
b0da16490f168f68072973b45dbc27a74fb7b529 mercurial/histedit
4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
64981213be2efd939e6e6e109e2b32c24e95fd95 vim/bundle/AnsiEsc.vim
--- a/bin/ccl-rlwrap Wed Apr 20 17:18:27 2016 +0000
+++ b/bin/ccl-rlwrap Wed May 04 11:24:25 2016 +0000
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# rlwrap ros -L ccl-bin run -l ~/.ccl-init.lisp "$@"
+rlwrap ros -L ccl-bin run -l ~/.ccl-init.lisp "$@"
# roswell performance ccl is fucked atm, see here https://github.com/roswell/roswell/issues/141
-rlwrap /usr/local/bin/ccl64 "$@"
+# rlwrap /usr/local/bin/ccl64 "$@"
--- a/bin/quicklisp-update Wed Apr 20 17:18:27 2016 +0000
+++ b/bin/quicklisp-update Wed May 04 11:24:25 2016 +0000
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
-sbcl --eval '(ql:update-client)' --eval '(ql:update-all-dists)' --eval '(quit)'
+sbcl-rlwrap --eval '(ql:update-client)' --eval '(ql:update-all-dists)' --eval '(quit)'
--- a/ccl-init.lisp Wed Apr 20 17:18:27 2016 +0000
+++ b/ccl-init.lisp Wed May 04 11:24:25 2016 +0000
@@ -1,5 +1,5 @@
-
(setf *quit-on-eof* t)
+(setq *load-preserves-optimization-settings* t)
(defun sjl-lisp-prompt-format (stream level)
(if (zerop level)
@@ -8,9 +8,10 @@
(setf ccl:*listener-prompt-format* #'sjl-lisp-prompt-format)
+
;;; The following lines added by ql:add-to-init-file:
-#-quicklisp
-(let ((quicklisp-init (merge-pathnames ".quicklisp/setup.lisp" (user-homedir-pathname))))
- (when (probe-file quicklisp-init)
- (load quicklisp-init)))
+; #-quicklisp
+; (let ((quicklisp-init (merge-pathnames ".quicklisp/setup.lisp" (user-homedir-pathname))))
+; (when (probe-file quicklisp-init)
+; (load quicklisp-init)))
--- a/ffignore Wed Apr 20 17:18:27 2016 +0000
+++ b/ffignore Wed May 04 11:24:25 2016 +0000
@@ -2,7 +2,9 @@
.DS_Store
cookbook
banner.txt
+UnityTempFile
syntax:regex
^tags$
^tags.bak$
+\.meta$
--- a/gitconfig Wed Apr 20 17:18:27 2016 +0000
+++ b/gitconfig Wed May 04 11:24:25 2016 +0000
@@ -74,6 +74,7 @@
uu = !git merge --ff-only upstream/`git currentbranch`
fuu = "!sh -c 'git fu && git uu' -"
+ fuo = "!sh -c 'git fo && git uo' -"
fuum = "!sh -c 'git co master && git fuu' -"
addremove = !git add . && git add -u
@@ -131,10 +132,10 @@
status = auto
[difftool "KaleidoscopeWithId"]
- cmd = ksdiff --partial-changeset --UUID \"$KSID\" --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+ cmd = ksdiff --partial-changeset --UUID \"$KSID\" --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool "Kaleidoscope"]
- cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+ cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
@@ -150,8 +151,12 @@
trustExitCode = true
[mergetool "Kaleidoscope"]
- cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
- trustExitCode = true
+ cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+ trustExitCode = true
+
+[mergetool "unity"]
+ trustExitCode = false
+ cmd = '/Applications/Unity/Unity.app/Contents/Tools/UnityYAMLMerge' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
[web]
browser = open
--- a/lispwords Wed Apr 20 17:18:27 2016 +0000
+++ b/lispwords Wed May 04 11:24:25 2016 +0000
@@ -3,9 +3,12 @@
(-1 loop)
(2 defmethod)
(2 with-accessors)
+(0 :use :export :documentation)
+(1 :shadowing-import-from :import-from)
; my own weird things
(1 make-array)
+(1 once-only)
; fiveam
(1 test)
@@ -28,3 +31,6 @@
; sketch
(1 with-pen)
(3 defsketch)
+
+; sbcl
+(1 with-profiling)
--- a/vim/ftplugin/lisp/lispfolding.vim Wed Apr 20 17:18:27 2016 +0000
+++ b/vim/ftplugin/lisp/lispfolding.vim Wed May 04 11:24:25 2016 +0000
@@ -148,6 +148,9 @@
elseif getline(a:lnum) =~ '^(test '
" (test ...) folds at the top level
return ">1"
+ elseif getline(a:lnum) =~ '^(declaim\( \|$\)'
+ " fold top level declaims
+ return ">1"
elseif getline(a:lnum) =~ '^(def\S\+ '
" fuck it just fold everything that looks kinda deffy
return ">1"
--- a/vim/vimrc Wed Apr 20 17:18:27 2016 +0000
+++ b/vim/vimrc Wed May 04 11:24:25 2016 +0000
@@ -760,12 +760,14 @@
augroup ft_csharp
au!
au FileType cs setlocal foldmethod=marker foldmarker={,}
- au FileType cs setlocal ts=4 sts=4 sw=4 noexpandtab
+ au FileType cs setlocal ts=4 sts=4 sw=4 expandtab
au FileType cs setlocal foldtext=MyFoldText()
au FileType cs inoremap <c-n> <c-x><c-o>
au FileType cs nnoremap <c-]> :OmniSharpGotoDefinition<cr>
au FileType cs nnoremap M :OmniSharpDocumentation<cr>
+
+ au FileType cs nnoremap gi mz=ap`z
augroup END
" }}}