From 1b9f2802039a7fb72e6cbdb7a1e5271a94f8ac69 Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Thu, 10 Aug 2017 11:48:33 -0400
Subject: [PATCH] Stop cursor jump that can happen when removing trailing
 spaces during a vim save

---
 vim/spell/en.utf-8.add     |  22 ++++++++++++++++++++++
 vim/spell/en.utf-8.add.spl | Bin 1314 -> 1540 bytes
 vimrc                      |  14 ++++++++++----
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index 5676400..733ed79 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -105,3 +105,25 @@ ethernet
 Cancelled
 indie
 etc
+texel
+Subpixel
+texels
+subpixel
+blitting
+shaders
+rasterizer
+subsampled
+downsample
+performant
+devs
+LUT
+realtime
+tradeoff
+params
+param
+toolset
+bootsector
+bootable
+virtualized
+VM
+multithreading
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
index 059111d451412496a291ff42ee79767b068d63cd..c9558aa395de4b3db6cb83b1a2f2871da3f58e6a 100644
GIT binary patch
literal 1540
zcmYLJ&5GPc5biE%oj1rWVCEuX7#4D00*)_E2pe!>VvG+hsYmKvNiFMVXU8WW3^~l*
zPvB?B#mC^YU%?Q+fgd3GzUo=bGTqzNUwu{eRjHpo{&gOG*ZuIHG1<T0y0WVMu4%(n
z*AH===4HLvAM$FPR$EzbJ8LA2R`Sdg)|ky~zpjm4Y_uaV&K_*w&H0dbeOx6(+~Ito
z>$Xv^(MF+nw}_i<2|u1ZqEyPn(*&N*)?jt8(sF&~x;QU(IOWp;Ut5tZTt$(*ve$$?
zb7E#OrCpVPj<vnQX|i5KW;m02L?C$$t{t7uHRmGLbbCgp(qnBx7xQX2-=Ms~&hVMQ
zl+syjj|3LmlHeW7Om_=ovAlO=_%URr!VbM00QhfPb1gc%S4syOoS%;}Eb@}b8xVNf
zE>=~kYH^$ZhUt^fT_9*!rJ?{OGK;)9UMCq}meP=$PRep5Y(R8?Ui8upz$Fz<fQ>S5
zs@(aYeL1#06x!ie!EM2g>cxm4Ra&)O$5i{Ov6%(vpEo(yqV|zu#MF@EszQ~pXg-@g
zC;{7!8P*Rqmh*ndY77GfdlBp{fHnSbdS4<QtpjW--(`e6!>Q&u^E3NA=&wluj#^Jq
z(yv&~JoK_(y0{{&11l@S&Bh5sZwHvD&>j~IG$}+&+!nY&`Ru~yo}Fe13cDZ=`#+xs
z)Qcf$4FmS#_8aHhE>5)F!VTaAm~q&NiP-u?^@+V15GTTNMep~Vl>=gj#P<E7sbYlK
z4-K$g_+>Ex4zmvA(b*<NQf9V|@D6{>;*dE%!Ff6PyrQ-7_we2ChEZyw>_^s%{f_`o
z++Q#gicNtNTWW`TJIbj&eX9eHnMR;^l3=`7wP9Hg(!%=B44@AB)`9Zmww;jj-Doyi
zG8N?)WglR+Wt<V0;{d}OzAnAKG9bjqMa>wnJ@dN&sS{5A<aong+%<@8$N93)YM^)%
zRTKMQMr8rXz;@q>TQ#qko`lU#>E-V>E9n!`1ZsmC)<9vSih}FE&<~<|fyjH6IMrb;
z19(=&Q@ZToD|Swws!c$@t`UwztZ<K=W4hwA#z4tyW6Ur4Pmh0lrjXMsW}hJH-5X{g
f1Jz95%p;ca-9sq&b)<e)+Y_b!U8#xjpf=`zENmSa

delta 715
zcmXX@J#W-N5cRB`NCA`rQ6M3b$jZqP(g_KLI#A{$+EB0UJ$rL|UhC{r5>lKj(TCG^
z&>#xRh~I%|Qt~HI8ftj6d$PPAGw;25JM;0;w+Fjtr|-H}8T0C26ve0O-S<z(5=GIt
z;x%n~J+SMq#}6gtWPDJqf4|*HIGrnP+!2kAZ!Gn+pd}U9m$VSb-Y6_5T0{j&<Zv06
zp6}0@ai3`P=BG-eW~pW=3PTD-Y;e%dLb<bCRE937Mp7}qWmp4EoCo)pM%21z;_yYQ
zP`gHT#;^?bRmDEDQdzcVY37qoi|6u3iOkD+6PKnJY<19d3FQ(WZr^j#ybldx-tojj
zyV;oQgz5lj{9kR1HB89zErl1+o%<t>o(>Dh$?%eKhP`LZFYQj^{ljfl8@s?gy$mJN
zDX<MNmgaQsZMZM-Ydr8S-hV9AVq50Lv}wIXx;1Vu*;@@CK;phb=-wjbyL9bmkQr9D
z)OlxZQt19l)QH`7fXz8NmQ<l;XlF%N@Th>Vk)s`Mv=>h6WUApc2uV;G)PuHy#$+za
zFjXF&4jnv@=ogbkTgN$2nGU`554)G(8hjSseR0!+sW55ocQ6o5w9uQWr5fQGO+5wP
NiVILtz<u62{}1^ek2(MV

diff --git a/vimrc b/vimrc
index ba9ef33..640df15 100644
--- a/vimrc
+++ b/vimrc
@@ -187,7 +187,7 @@ set incsearch " Highlight matches as you type
 set hlsearch " Highlight matches
 set dictionary+=/usr/share/dict/words
 "set clipboard=unnamed " yank and paste with the system clipboard
-set relativenumber " Use realtive line numebrs
+set nonumber
 " make searches case-sensitive only if they contain upper-case characters
 set ignorecase smartcase
 set visualbell " No bell sounds
@@ -257,9 +257,6 @@ if has('persistent_undo')
     set undofile
 endif
 
-" Remove trailing whitespace on save all files.
-au BufWritePre * :%s/\s\+$//e
-
 " Fix vim's background colour erase - http://snk.tuxfamily.org/log/vim-256color-bce.html
 if &term =~ '256color'
   " Disable Background Color Erase (BCE) so that color schemes
@@ -310,6 +307,15 @@ augroup campoCmds
   autocmd BufWritePost *.vim so $MYVIMRC
   autocmd BufWritePost vimrc.symlink so $MYVIMRC
 
+  " Remove trailing whitespace on save all files.
+  function! <SID>StripTrailingWhitespaces()
+    let l = line(".")
+    let c = col(".")
+    %s/\s\+$//e
+    call cursor(l, c)
+  endfun
+  autocmd BufWritePre * :call <SID>StripTrailingWhitespaces()
+
   "////////////////////////////////////////////////////////////////
   " FILE TEMPLATES
   "////////////////////////////////////////////////////////////////