# HG changeset patch
# User Tomas Zeman <tzeman@volny.cz>
# Date 1395999983 -3600
# Node ID b335d6720d85c5192ec482ca5e88dccb75bbf01a
# Parent  febb97e0443071f8dec731e0c07b628c5fc33f5b# Parent  e77797110e95c6e8de6ebf7fcd10753718570535
branch merge

diff -r e77797110e95 -r b335d6720d85 config/.vim/ftplugin/python.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/.vim/ftplugin/python.vim	Fri Mar 28 10:46:23 2014 +0100
@@ -0,0 +1,4 @@
+set tabstop=8
+set expandtab
+set shiftwidth=4
+set softtabstop=4
diff -r e77797110e95 -r b335d6720d85 config/.vimrc
--- a/config/.vimrc	Tue Mar 18 12:03:32 2014 +0100
+++ b/config/.vimrc	Fri Mar 28 10:46:23 2014 +0100
@@ -51,9 +51,10 @@
 " Coffee-script related
 vmap <leader>c <esc>:'<,'>:CoffeeCompile<CR>
 map <leader>c :CoffeeCompile<CR>
-command -nargs=1 C CoffeeCompile | :<args>
+"command -nargs=1 C CoffeeCompile | :<args>
 au BufWritePost *.coffee silent CoffeeMake! -b | cwindow | redraw!
 "let coffee_compile_vert = 1
 au BufNewFile,BufReadPost *.coffee setl foldmethod=indent "nofoldenable
 au BufNewFile,BufReadPost *.coffee setl shiftwidth=2 expandtab
 
+filetype plugin on
diff -r e77797110e95 -r b335d6720d85 scripts/svn
--- a/scripts/svn	Tue Mar 18 12:03:32 2014 +0100
+++ b/scripts/svn	Fri Mar 28 10:46:23 2014 +0100
@@ -8,7 +8,7 @@
 
 if [ "$1" = "commit" -o "$1" = "ci" ]; then
     shift # pop off $1 for diff
-    TEMPLATE=`mktemp svn-ci.XXXXXXX`
+    TEMPLATE=`mktemp --tmpdir svn-ci.XXXXXXX`
     $REALSVN diff "$@" > "$TEMPLATE"
     $REALSVN $ARGS --editor-cmd="$HOME/bin/svn-diff-editor '$TEMPLATE'"
 else
diff -r e77797110e95 -r b335d6720d85 scripts/svn-diff-editor
--- a/scripts/svn-diff-editor	Tue Mar 18 12:03:32 2014 +0100
+++ b/scripts/svn-diff-editor	Fri Mar 28 10:46:23 2014 +0100
@@ -1,6 +1,27 @@
 #!/bin/sh
 
-echo >> "$2"
-cat "$1" >> "$2"
-rm "$1"
-$EDITOR "$2"
+case "${EDITOR}" in
+    "")
+        EDITOR="vi"
+        ;;
+    emacs)
+        EDITOR="$EDITOR -nw"
+        ;;
+    gvim|vim)
+        EDITOR="$EDITOR -f -o"
+        ;;
+esac
+
+SVNTMP="$1"
+cleanup_exit() {
+    rm -rf "$SVNTMP"
+}
+
+# Remove temporary files even if we get interrupted
+trap "cleanup_exit" 0 # normal exit
+trap "exit 255" HUP INT QUIT ABRT TERM
+
+#echo >> "$2"
+#cat "$1" >> "$2"
+#rm "$1"
+$EDITOR "$2" "$1"