r712 - /trunk/packages/vim/debian/runtime/debian.vim.in

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Mon Jun 12 16:43:11 2006
New Revision: 712

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=712
Log:
Revert the detection of whether vim was run as 'vi' or not.

Modified:
    trunk/packages/vim/debian/runtime/debian.vim.in

Modified: trunk/packages/vim/debian/runtime/debian.vim.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/runtime/debian.vim.in?rev=712&op=diff
==============================================================================
--- trunk/packages/vim/debian/runtime/debian.vim.in (original)
+++ trunk/packages/vim/debian/runtime/debian.vim.in Mon Jun 12 16:43:11 2006
@@ -1,73 +1,65 @@
+
 " Debian system-wide default configuration Vim
 
 set runtimepath=~/.vim,/var/lib/vim/addons,/usr/share/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/@VIMCUR@,/usr/share/vim/vimfiles/after,/usr/share/vim/addons/after,/var/lib/vim/addons/after,~/.vim/after
 
-if v:progname == "vi"
+" Normally we use vim-extensions. If you want true vi-compatibility
+" remove change the following statements
+set nocompatible	" Use Vim defaults instead of 100% vi compatibility
+set backspace=indent,eol,start	" more powerful backspacing
 
-    " user wants vi to be in compatible mode
-    set compatible
+" Now we set some defaults for the editor
+set autoindent		" always set autoindenting on
+" set linebreak		" Don't wrap words by default
+set textwidth=0		" Don't wrap lines by default
+set viminfo='20,\"50	" read/write a .viminfo file, don't store more than
+			" 50 lines of registers
+set history=50		" keep 50 lines of command line history
+set ruler		" show the cursor position all the time
 
-else
+" Suffixes that get lower priority when doing tab completion for filenames.
+" These are files we are not likely to want to edit or read.
+set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
 
-    " Normally we use vim-extensions. If you want true vi-compatibility
-    " remove change the following statements
-    set nocompatible	" Use Vim defaults instead of 100% vi compatibility
-    set backspace=indent,eol,start	" more powerful backspacing
+" We know xterm-debian is a color terminal
+if &term =~ "xterm-debian" || &term =~ "xterm-xfree86"
+  set t_Co=16
+  set t_Sf=[3%dm
+  set t_Sb=[4%dm
+endif
 
-    " Now we set some defaults for the editor
-    set autoindent		" always set autoindenting on
-    " set linebreak		" Don't wrap words by default
-    set textwidth=0		" Don't wrap lines by default
-    set viminfo='20,\"50	" read/write a .viminfo file, don't store more than
-                            " 50 lines of registers
-    set history=50		" keep 50 lines of command line history
-    set ruler		" show the cursor position all the time
+if has("autocmd")
+ " Enabled file type detection
+ " Use the default filetype settings. If you also want to load indent files
+ " to automatically do language-dependent indenting add 'indent' as well.
+ filetype plugin on
 
-    " Suffixes that get lower priority when doing tab completion for filenames.
-    " These are files we are not likely to want to edit or read.
-    set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
+endif " has ("autocmd")
 
-    " We know xterm-debian is a color terminal
-    if &term =~ "xterm-debian" || &term =~ "xterm-xfree86"
-      set t_Co=16
-      set t_Sf=[3%dm
-      set t_Sb=[4%dm
+" Some Debian-specific things
+if has("autocmd")
+  augroup filetype
+    au BufRead reportbug.*		set ft=mail
+    au BufRead reportbug-*		set ft=mail
+  augroup END
+endif
+
+" Set paper size from /etc/papersize if available (Debian-specific)
+if filereadable("/etc/papersize")
+  try
+    let s:shellbak = &shell
+    let &shell="/bin/sh"
+    let s:papersize = matchstr(system("cat /etc/papersize"), "\\p*")
+    let &shell=s:shellbak
+    if strlen(s:papersize)
+      let &printoptions = "paper:" . s:papersize
     endif
+  catch /^Vim\%((\a\+)\)\=:E145/
+  endtry
+endif
 
-    if has("autocmd")
-     " Enabled file type detection
-     " Use the default filetype settings. If you also want to load indent files
-     " to automatically do language-dependent indenting add 'indent' as well.
-     filetype plugin on
-
-    endif " has ("autocmd")
-
-    " Some Debian-specific things
-    if has("autocmd")
-      augroup filetype
-        au BufRead reportbug.*		set ft=mail
-        au BufRead reportbug-*		set ft=mail
-      augroup END
-    endif
-
-    " Set paper size from /etc/papersize if available (Debian-specific)
-    if filereadable("/etc/papersize")
-      try
-        let s:shellbak = &shell
-        let &shell="/bin/sh"
-        let s:papersize = matchstr(system("cat /etc/papersize"), "\\p*")
-        let &shell=s:shellbak
-        if strlen(s:papersize)
-          let &printoptions = "paper:" . s:papersize
-        endif
-      catch /^Vim\%((\a\+)\)\=:E145/
-      endtry
-    endif
-
-    if has('gui_running')
-      " Make shift-insert work like in Xterm
-      map <S-Insert> <MiddleMouse>
-      map! <S-Insert> <MiddleMouse>
-    endif
-
+if has('gui_running')
+  " Make shift-insert work like in Xterm
+  map <S-Insert> <MiddleMouse>
+  map! <S-Insert> <MiddleMouse>
 endif