vimrc: only set title if the caller requests it or in gvim

This should rule out problems with vim breaking screen titles when called
from programs like w3m or mutt.

diff --git a/etc/vim/vimrc b/etc/vim/vimrc
index 8cc5eca..2a7dd0f 100644 (file)
--- a/etc/vim/vimrc
+++ b/etc/vim/vimrc
@@ -96,7 +96,7 @@
   set dictionary=/usr/share/dict/word " used with CTRL-X CTRL-K
 
 """ set the screen hardstatus to vim(filename.ext)
-  if (&term =~ '^screen') && ($NOPRECMD != '1')
+  if ((&term =~ '^screen') && ($VIM_PLEASE_SET_TITLE =~ '^yes$') || has('gui_running'))
     set t_ts=\ek
     set t_fs=\e\
     set title