From fedbc3dcfc1eff62e84606f307b7ea6fcb6455d2 Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Fri, 30 Sep 2016 14:39:57 +0300
Subject: [PATCH] fix trap printing to stdout and support a new feature in vim
 8 (as well as fix dependency for an older feature)

---
 bashrc | 2 +-
 vimrc  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bashrc b/bashrc
index 4971132..d6c32c7 100644
--- a/bashrc
+++ b/bashrc
@@ -187,5 +187,5 @@ unset completion_path git_prompt_path
 # }}}
 # {{{ traps
 # we want to see exit code on error (it also has to be the last entry here)
-trap 'printf "${nred}>>${reset} ${bold}exit${reset} ${nred}%s${reset}\n" "$?"' ERR
+trap 'printf "${nred}>>${reset} ${bold}exit${reset} ${nred}%s${reset}\n" "$?" >&2' ERR
 # }}}
diff --git a/vimrc b/vimrc
index 443bd82..9685c64 100644
--- a/vimrc
+++ b/vimrc
@@ -20,7 +20,7 @@ set noerrorbells visualbell t_vb=
 " indentation_RIP
 "set shiftwidth=3 tabstop=3 noexpandtab
 " indentation_OK
-set tabstop=3 softtabstop=4 shiftwidth=4 colorcolumn=81 smarttab expandtab
+set tabstop=3 softtabstop=4 shiftwidth=4 smarttab expandtab
 
 set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [POS=%04l,%04v][%p%%]\ [LEN=%L]
 
@@ -60,9 +60,13 @@ nnoremap L $
 " still have to deal with old vim versions :<
 if v:version >= 700
     if v:version >= 703
+        set colorcolumn=80
         set relativenumber
         nnoremap <Leader>r :setlocal relativenumber!<CR>
     endif
+    if v:version >= 800
+        set breakindent
+    endif
 
     set helplang=en
     set list