r703 - in /trunk/packages/vim/debian: changelog runtime/debian.vim.in runtime/virc

madcoder at users.alioth.debian.org madcoder at users.alioth.debian.org
Sat Jun 3 11:24:08 UTC 2006


Author: madcoder
Date: Sat Jun  3 11:24:07 2006
New Revision: 703

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=703
Log:
make the compatible/nocompatible choice been done in debian.vim based on
v:progname.

now the debconf stuff needs to be dealt with ;)


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

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=703&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Jun  3 11:24:07 2006
@@ -1,3 +1,11 @@
+vim (1:7.0-017+6) UNRELEASED; urgency=low
+
+  [ Pierre Habouzit ]
+  * make virc source $RUNTIME/debian.vim also, and use v:progname to detect if
+    it was called through vi or vim.
+
+ -- Pierre Habouzit <madcoder at debian.org>  Sat,  3 Jun 2006 13:22:25 +0200
+
 vim (1:7.0-017+5) unstable; urgency=low
 
   [ James Vega ]

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=703&op=diff
==============================================================================
--- trunk/packages/vim/debian/runtime/debian.vim.in (original)
+++ trunk/packages/vim/debian/runtime/debian.vim.in Sat Jun  3 11:24:07 2006
@@ -1,65 +1,73 @@
-
 " 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
 
-" 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
+if v:progname == "vi"
 
-" 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
+    " user wants vi to be in compatible mode
+    set compatible
 
-" 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
+else
 
-" 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
+    " 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
+
+    " 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
+
+    " 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
+
+    " 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
+
+    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
+
 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

Modified: trunk/packages/vim/debian/runtime/virc
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/runtime/virc?rev=703&op=diff
==============================================================================
--- trunk/packages/vim/debian/runtime/virc (original)
+++ trunk/packages/vim/debian/runtime/virc Sat Jun  3 11:24:07 2006
@@ -5,6 +5,8 @@
 " When Vim is invoked differently ("vim", "view", "evim", ...) this file is
 " _not_ sourced; /etc/vim/vimrc and/or /etc/vim/gvimrc are.
 
-set compatible
+" This line should not be removed as it ensures that various options are
+" properly set to work with the Vim-related packages available in Debian.
+runtime! debian.vim
 
 " vim: set ft=vim:




More information about the pkg-vim-maintainers mailing list