Merge branch 'master' into ursa_minor

16 files changed, 6 insertions, 45 deletions

diff --git a/vim/.vim/after/ftplugin/haskell.vim b/vim/.vim/after/ftplugin/haskell.vim
index b0ce109..109cd5b 100644
--- a/vim/.vim/after/ftplugin/haskell.vim
+++ b/vim/.vim/after/ftplugin/haskell.vim
@@ -4,4 +4,3 @@ set expandtab                   "Always uses spaces instead of tabs
 set softtabstop=4               "Insert 4 spaces when tab is pressed
 set shiftwidth=4                "An indent is 4 spaces
 set shiftround                  "Round indent to nearest shiftwidth multiple
-
diff --git a/vim/.vim/after/ftplugin/nroff.vim b/vim/.vim/after/ftplugin/nroff.vim
new file mode 100644
index 0000000..031c8d9
--- /dev/null
+++ b/vim/.vim/after/ftplugin/nroff.vim
@@ -0,0 +1,2 @@
+set spell
+autocmd BufWritePost * silent! !grap % | pic | tbl | eqn | troff -ms | grops > %:r.ps
diff --git a/vim/.vim/after/ftplugin/rst.vim b/vim/.vim/after/ftplugin/rst.vim
index 4ea3bbf..c5fc1a9 100644
--- a/vim/.vim/after/ftplugin/rst.vim
+++ b/vim/.vim/after/ftplugin/rst.vim
@@ -1,7 +1,6 @@
 " Tab specific option
-set tabstop=8                   "A tab is 8 spaces
-set noexpandtab                   "Always uses spaces instead of tabs
-set shiftwidth=2                "An indent is 4 spaces
-set softtabstop=8               "Insert 4 spaces when tab is pressed
+set tabstop=4                   "A tab is 8 spaces
+set expandtab                   "Always uses spaces instead of tabs
+set softtabstop=4               "Insert 4 spaces when tab is pressed
+set shiftwidth=4                "An indent is 4 spaces
 set shiftround                  "Round indent to nearest shiftwidth multiple
-
diff --git a/vim/.vim/after/ftplugin/tex.vim b/vim/.vim/after/ftplugin/tex.vim
index 95e50d4..87f4512 100644
--- a/vim/.vim/after/ftplugin/tex.vim
+++ b/vim/.vim/after/ftplugin/tex.vim
@@ -1,2 +1 @@
 set spell
-au BufWritePost * silent! execute "!pdflatex %" | redraw!
diff --git a/vim/.vim/after/ftplugin/tr.vim b/vim/.vim/after/ftplugin/tr.vim
deleted file mode 100644
index 87f4512..0000000
--- a/vim/.vim/after/ftplugin/tr.vim
+++ /dev/null
@@ -1 +0,0 @@
-set spell
diff --git a/vim/.vim/ftplugin/asm.vim b/vim/.vim/ftplugin/asm.vim
deleted file mode 100644
index e69de29..0000000
--- a/vim/.vim/ftplugin/asm.vim
+++ /dev/null
diff --git a/vim/.vim/ftplugin/by.vim b/vim/.vim/ftplugin/by.vim
deleted file mode 100644
index 7f2b61c..0000000
--- a/vim/.vim/ftplugin/by.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set nospell
-set tw=0
diff --git a/vim/.vim/ftplugin/c.vim b/vim/.vim/ftplugin/c.vim
deleted file mode 100644
index a445f6f..0000000
--- a/vim/.vim/ftplugin/c.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-set tw=0
-set cindent
-set nospell
diff --git a/vim/.vim/ftplugin/conf.vim b/vim/.vim/ftplugin/conf.vim
deleted file mode 100644
index 7f2b61c..0000000
--- a/vim/.vim/ftplugin/conf.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set nospell
-set tw=0
diff --git a/vim/.vim/ftplugin/go.vim b/vim/.vim/ftplugin/go.vim
deleted file mode 100644
index 736e482..0000000
--- a/vim/.vim/ftplugin/go.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tw=0
-set cindent
diff --git a/vim/.vim/ftplugin/java.vim b/vim/.vim/ftplugin/java.vim
deleted file mode 100644
index 736e482..0000000
--- a/vim/.vim/ftplugin/java.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set tw=0
-set cindent
diff --git a/vim/.vim/ftplugin/mail.vim b/vim/.vim/ftplugin/mail.vim
deleted file mode 100644
index c6e2b8a..0000000
--- a/vim/.vim/ftplugin/mail.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-set softtabstop=4
-set shiftwidth=4
-set expandtab
diff --git a/vim/.vim/ftplugin/python.vim b/vim/.vim/ftplugin/python.vim
deleted file mode 100644
index 643e63d..0000000
--- a/vim/.vim/ftplugin/python.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-set nospell
-set tw=0
-set tabstop=8
-set softtabstop=8
-set shiftwidth=8
-set noexpandtab
-
diff --git a/vim/.vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim
deleted file mode 100644
index 87f4512..0000000
--- a/vim/.vim/ftplugin/tex.vim
+++ /dev/null
@@ -1 +0,0 @@
-set spell
diff --git a/vim/.vim/ftplugin/tree.vim b/vim/.vim/ftplugin/tree.vim
deleted file mode 100644
index 073abf6..0000000
--- a/vim/.vim/ftplugin/tree.vim
+++ /dev/null
@@ -1,13 +0,0 @@
-set tw=0
-set nolist
-set nospell
-
-map pp a,    01<esc>
-map PP a,    09<esc>
-map tt a,    06<esc>
-map bb a,    07<esc>
-map ss a,    03<esc>
-map SS a,    04<esc>
-map nn a,    05<esc>
-map vv a,    02<esc>
-map cc a,  Cull<esc>
diff --git a/vim/.vim/ftplugin/txt.vim b/vim/.vim/ftplugin/txt.vim
deleted file mode 100644
index 7dcafeb..0000000
--- a/vim/.vim/ftplugin/txt.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set spell
-set tw=70