diff --git a/.vimrc b/.vimrc
index fd6bd4d..66b0dbf 100644
--- a/.vimrc
+++ b/.vimrc
@@ -183,6 +183,10 @@ set smartcase
 " reload file when changes happen in other editors
 set autoread
 
+" hide buffers instead of closing them (so no saving is needed and undo and
+" marks are preserved)
+set hidden
+
 " 2008-04-14 with the if-statement added at 2008-11-19
 if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen"
 	set t_Co=256