Several things:

* Added some emacs config
* Vim again for git commits
* Added cursorline to vimrc

3 files changed, 8 insertions, 2 deletions

diff --git a/emacs b/emacs
index f49670f..4b305e0 100644
--- a/emacs
+++ b/emacs
@@ -3,5 +3,10 @@
 (global-linum-mode)
 (setq linum-format "%d ")
 
-;; no backups
+;; no backup and autosave files
 (setq make-backup-files nil)
+(setq backup-inhibited t)
+
+;; hilight actual line
+(global-hl-line-mode 1)
+(set-face-background 'hl-line "#333")
\ No newline at end of file
diff --git a/gitconfig b/gitconfig
index 511dc9f..8aed15c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,4 +7,4 @@
 [colors]
 	ui = auto
 [core]
-	editor = emacs
+	editor = vim
diff --git a/vim/vimrc b/vim/vimrc
index 3504746..5b01cc1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -10,6 +10,7 @@ set tabstop=8
 set shiftround
 set modeline
 set nobackup
+set cursorline
 
 map <f9> :make<CR>
 map <f1> :execute 'NERDTreeToggle'<CR>