2 files changed, 16 insertions, 1 deletions

diff --git a/vim.desktop b/vim.desktop
new file mode 100644
index 0000000..3d52f9b
--- /dev/null
+++ b/vim.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Vi IMproved->buffer
+Icon=gvim
+Comment=Open file in an existing instance of vi and in a new tab
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=bash -c "~/.bashrc ; vim --servername VIM --remote-silent %F"
+Terminal=true
+X-XClassHintResName=VIM
+Categories=Utility;TextEditor;
+X-Desktop-File-Install-Version=0.23
diff --git a/vimrc b/vimrc
index 5ab571a..e155604 100644
--- a/vimrc
+++ b/vimrc
@@ -179,7 +179,8 @@ set hlsearch                  | " highlights all search matches (not as performa
 set ignorecase smartcase      | " search with ignorecase by default, but use case sensitive search when one captical char is contained
 set lazyredraw                | " disables redraw during macro exectution (improves performance)
 set linebreak                 | " wrap long lines at char 'breakat', not inside words
-set mouse=a                   | " also supported by vim, should be default
+set mouse=n                   | " allow mouse in normal mode only, so one can use the terminals c&p feature in insert mode
+set mousemodel=popup          | " only in gvim: right click opens a popup-menu
 set nocursorcolumn            | " turn visual cursor column off (improves performance)
 set nocursorline              | " turn visual cursor line off (improves performance)
 set nofoldenable              | " disable code folding. I hate code folding
@@ -191,6 +192,7 @@ set nowrap                    | " but do not (by default) wrap long lines around
 set number                    | " turn line numbers on/off (performance decreases when they are shown)
 set pumheight=8               | " Determines the maximum number of items to show in the popup menu for
 set redrawtime=400            | " The time in milliseconds for redrawing the display.
+set restorescreen             | " restores the console after exiting vim
 set scrolljump=5              | " how many lines get scrolled into view when cursor reaches the screens edge
 set spell spelllang=en,de     | " enable spell checker
 set splitbelow                | " open new windows below the current one (i find that more intuitive)
@@ -208,6 +210,7 @@ set writedelay=0
 if has("multi_byte")
   scriptencoding utf-8        | " tell vim that we are using utf-8 here
   set encoding=utf-8          | " we need default utf-8 encoding to use cool chars as line break and so on (see below)
+  set termencoding=&encoding  | " once we use special chars we assume everybody uses a terminal supporting those
   set listchars=eol:↲         | " symbols used when using :set list (which displays non-printable chars)
   set listchars+=extends:»    | " symbols used when using :set list (which displays non-printable chars)
   set listchars+=precedes:«   | " symbols used when using :set list (which displays non-printable chars)
@@ -227,6 +230,7 @@ if has("gui_running")
   " set guifont=Droid\ Sans\ Mono\ for\ Powerline\ 12
   set guifont=Dejavu\ Sans\ Mono\ for\ Powerline\ 12
   set guioptions-=e           | " do not display tabs
+  set winaltkeys=menu         | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped)
 endif
 
 if bufname('%') == ''