r715 - 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 Jun 15 17:44:09 UTC 2006
Author: jamessan
Date: Thu Jun 15 17:44:07 2006
New Revision: 715
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=715
Log:
Add 'set compatible' to vimrc.tiny and update debian.vim to only set 'runtimepath' when vim-tiny is invoked as vi. (#373680)
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=715&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Thu Jun 15 17:44:07 2006
@@ -1,8 +1,15 @@
+vim (1:7.0-017+7) unstable; urgency=low
+
+ * Update $VIMRUNTIME/debian.vim and /etc/vim/vimrc.tiny to properly set
+ 'compatible' when vim-tiny is invoked as vi. (closes: #373680)
+
+ -- James Vega <jamessan at debian.org> Wed, 14 Jun 2006 23:18:11 -0400
+
vim (1:7.0-017+6) unstable; urgency=low
[ Pierre Habouzit ]
* Add a Replace: vim-runtime to vim-common because of the vimcurrent mess,
- that may prevent vim upgrade. (Closes: #370012, #373117).
+ that may prevent vim upgrade. (closes: #370012, #373117).
[ James Vega ]
* Add vim-variant.preinst to remove any cruft left behind 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=715&op=diff
==============================================================================
--- trunk/packages/vim/debian/runtime/debian.vim.in (original)
+++ trunk/packages/vim/debian/runtime/debian.vim.in Thu Jun 15 17:44:07 2006
@@ -5,61 +5,64 @@
" 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 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
-" 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
+ " 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
+ " 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
+ " 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/tiny/vimrc.tiny
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/tiny/vimrc.tiny?rev=715&op=diff
==============================================================================
--- trunk/packages/vim/debian/tiny/vimrc.tiny (original)
+++ trunk/packages/vim/debian/tiny/vimrc.tiny Thu Jun 15 17:44:07 2006
@@ -5,6 +5,11 @@
" 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
+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
More information about the pkg-vim-maintainers
mailing list