.vim: Press `<Enter>` instead of `<C-]>` in help

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index b0a7f7b182cb086d9a64f05627a6d174d7ea5813..fae0e9f94bc1757db4fc29f6d39fd32c302f265c 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -74,6 +74,7 @@ set nohlsearch    " Stop the search highlighting
 
 set hidden        " Don't unload a buffer when no longer shown in a window; allow to switch between buffers/windows when the buffer is modified
 set laststatus=2  " Always show status line
+" set statusline=%<%f\ %h%m%r%=%-14.(%l,%c%V%)\ %P " Default statusline
 
 set splitbelow    " A new window is put below of the current one
 set splitright    " A new window is put right of the current one
@@ -84,10 +85,13 @@ set ttyfast       " terminal connection is fast
 
 set title         " Set title to the value of 'titlestring' or to 'filename - VIM'
 set titleold=     " string to restore the title to when exiting Vim
-" String to use for the Vim window title; with statusline printf items:
+" String to use for the Vim window title; with statusline printf items.
+" This is the default:
+" display filename, modification flag, full path, and program name in uppercase.
+" set titlestring=%t%(\ %M%)%(\ (%{substitute(expand(\"%:p:h\"),\ $HOME,\ \"~\",\ \"\")})%)%(\ %a%)\ -\ %{toupper(v:progname)}
 " display filename, modification flag, full path, argument list status,
 " the current user, host and program name (to distinguish vim/view/etc).
-set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)\ -\ [%{$USER}@%{hostname()}]\ %{v:progname}
+set titlestring=%t%(\ %M%)%(\ (%{substitute(expand(\"%:p:h\"),\ $HOME,\ \"~\",\ \"\")})%)%(\ %a%)\ -\ %{v:progname}\ [%{$USER}@%{hostname()}]
 
 " 9 using the mouse
 
@@ -218,8 +222,8 @@ if has("gui_running")
    if has("win32")
       "set guifont=Courier_New:h18:cRUSSIAN
       set guifont=Lucida_Console:h18:cRUSSIAN
-   else
-      set guifont=Monospace\ 16
+   elseif has("x11")
+      set guifont=Monospace\ 18
       set toolbar=icons,text " how to show the toolbar
    endif