r1009 - in /trunk/packages/vim/debian: changelog runtime/debian.vim.in tiny/vimrc.tiny

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Thu Aug 9 15:02:02 UTC 2007


Author: jamessan
Date: Thu Aug  9 15:02:01 2007
New Revision: 1009

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1009
Log:
* Brown paper bag release -- vimrc.tiny should not be calling :let since
  vim.tiny doesn't support that command.  Copy the 'runtimepath' setting to
  vimrc.tiny since that was the only reason we needed the :let and
  "runtime!  debian.vim" commands.  (Closes: #436925)

Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/runtime/debian.vim.in
    trunk/packages/vim/debian/tiny/vimrc.tiny

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1009&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Thu Aug  9 15:02:01 2007
@@ -1,3 +1,12 @@
+vim (1:7.1-056+2) unstable; urgency=low
+
+  * Brown paper bag release -- vimrc.tiny should not be calling :let since
+    vim.tiny doesn't support that command.  Copy the 'runtimepath' setting to
+    vimrc.tiny since that was the only reason we needed the :let and
+    "runtime!  debian.vim" commands.  (Closes: #436925)
+
+ -- James Vega <jamessan at debian.org>  Thu, 09 Aug 2007 10:57:51 -0400
+
 vim (1:7.1-056+1) unstable; urgency=low
 
   [ Debian Vim Maintainers ]

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=1009&op=diff
==============================================================================
--- trunk/packages/vim/debian/runtime/debian.vim.in (original)
+++ trunk/packages/vim/debian/runtime/debian.vim.in Thu Aug  9 15:02:01 2007
@@ -5,66 +5,63 @@
 
 " Normally we use vim-extensions. If you want true vi-compatibility
 " remove change the following statements
-if exists('g:debian_cp')  " vim-tiny was started as vi. don't set remaining options
-else
-  set nocompatible	" Use Vim defaults instead of 100% vi compatibility
-  set backspace=indent,eol,start	" more powerful backspacing
+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 history=50		" keep 50 lines of command line history
-  set ruler		" show the cursor position all the time
+" Now we set some defaults for the editor
+set autoindent		" always set autoindenting on
+" set linebreak		" Don't wrap words by default
+set history=50		" keep 50 lines of command line history
+set ruler		" show the cursor position all the time
 
-  " modelines have historically been a source of security/resource
-  " vulnerabilities -- disable by default, even when 'nocompatible' is set
-  set nomodeline
+" modelines have historically been a source of security/resource
+" vulnerabilities -- disable by default, even when 'nocompatible' is set
+set nomodeline
 
-  " 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
+" 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
+" 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
+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")
+endif " has ("autocmd")
 
-  " Some Debian-specific things
-  if has("autocmd")
-    " set mail filetype for reportbug's temp files
-    augroup debian
-      au BufRead reportbug.*		set ft=mail
-      au BufRead reportbug-*		set ft=mail
-    augroup END
-  endif
+" Some Debian-specific things
+if has("autocmd")
+  " set mail filetype for reportbug's temp files
+  augroup debian
+    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
+" 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

Modified: trunk/packages/vim/debian/tiny/vimrc.tiny
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/tiny/vimrc.tiny?rev=1009&op=diff
==============================================================================
--- trunk/packages/vim/debian/tiny/vimrc.tiny (original)
+++ trunk/packages/vim/debian/tiny/vimrc.tiny Thu Aug  9 15:02:01 2007
@@ -5,13 +5,9 @@
 " When Vim is invoked differently ("vim", "view", "evim", ...) this file is
 " _not_ sourced; /etc/vim/vimrc and/or /etc/vim/gvimrc are.
 
-" g:debian_cp signifies that debian.vim should only setup the runtimepath and
-" not set any of the other vi-incompatible options
-let g:debian_cp = 1
+" Debian system-wide default configuration Vim
+set runtimepath=~/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/@VIMCUR@,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,~/.vim/after
+
 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