aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-06 18:33:02 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-06 18:33:02 +1200
commit0ecc38d167320bcbc1c73b78b2f6b942deb3557e (patch)
tree05702ac90c604c7eea9cd66c1906badcde6960ef
parent0478124eb33fd843f0eb077a30bab82170723d06 (diff)
parent7acbf79597ff45f9c2478f1b2a183b62de972abd (diff)
downloaddotfiles-0.48.2.tar.gz (sig)
dotfiles-0.48.2.zip
Merge branch 'hotfix/v0.48.2'v0.48.2
* hotfix/v0.48.2: Bump VERSION Remove duplicate 'encoding' setting
-rw-r--r--VERSION4
-rw-r--r--vim/vimrc5
2 files changed, 2 insertions, 7 deletions
diff --git a/VERSION b/VERSION
index 81062e5d..2144e753 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.48.1
-Wed Jun 6 06:09:59 UTC 2018
+tejr dotfiles v0.48.2
+Wed Jun 6 06:32:48 UTC 2018
diff --git a/vim/vimrc b/vim/vimrc
index 70f72ed6..2c0047d7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -162,11 +162,6 @@ nnoremap <silent> <Leader>n :<C-U>set number! number?<CR>
" Bind \p to show filetype
nnoremap <silent> <Leader>p :<C-U>set filetype?<CR>
-" Use UTF-8 by default wherever possible
-if has('multi_byte')
- set encoding=utf-8
-endif
-
" Use all ancestors of current directory for :find
if has('file_in_path')
set path=**