r668 - in /trunk/packages: vim-latexsuite/debian/
vim-latexsuite/debian/vim-registry/ vim/debian/ vim/debian/runtime/
vim/patches/
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Sat May 13 02:35:05 UTC 2006
Author: zack
Date: Sat May 13 02:35:03 2006
New Revision: 668
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=668
Log:
differentiated vim default configuration when it is invoked as "vi"
Added:
trunk/packages/vim-latexsuite/debian/dirs
trunk/packages/vim-latexsuite/debian/vim-registry/
trunk/packages/vim-latexsuite/debian/vim-registry/latexsuite
trunk/packages/vim/debian/runtime/virc
trunk/packages/vim/patches/virc.c.diff
Modified:
trunk/packages/vim-latexsuite/debian/changelog
trunk/packages/vim-latexsuite/debian/install
trunk/packages/vim/debian/NEWS
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/vim-common.install.in
trunk/packages/vim/patches/series
Modified: trunk/packages/vim-latexsuite/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/changelog?rev=668&op=diff
==============================================================================
--- trunk/packages/vim-latexsuite/debian/changelog (original)
+++ trunk/packages/vim-latexsuite/debian/changelog Sat May 13 02:35:03 2006
@@ -1,3 +1,9 @@
+vim-latexsuite (20060325-3) UNRELEASED; urgency=low
+
+ * Added latexsuite entry for the Vim add-on registry
+
+ -- Stefano Zacchiroli <zack at debian.org> Thu, 11 May 2006 11:58:20 -0500
+
vim-latexsuite (20060325-2) unstable; urgency=low
* Fixed mapping InsertItemOnThisLine by preventing it to reenter insert
Added: trunk/packages/vim-latexsuite/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/dirs?rev=668&op=file
==============================================================================
--- trunk/packages/vim-latexsuite/debian/dirs (added)
+++ trunk/packages/vim-latexsuite/debian/dirs Sat May 13 02:35:03 2006
@@ -1,0 +1,1 @@
+usr/share/vim/registry
Modified: trunk/packages/vim-latexsuite/debian/install
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/install?rev=668&op=diff
==============================================================================
--- trunk/packages/vim-latexsuite/debian/install (original)
+++ trunk/packages/vim-latexsuite/debian/install Sat May 13 02:35:03 2006
@@ -1,2 +1,3 @@
-ltags usr/share/doc/vim-latexsuite/contrib
-debian/bug/vim-latexsuite usr/share/bug
+ltags usr/share/doc/vim-latexsuite/contrib
+debian/bug/vim-latexsuite usr/share/bug
+debian/vim-registry/latexsuite usr/share/vim/registry
Added: trunk/packages/vim-latexsuite/debian/vim-registry/latexsuite
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/vim-registry/latexsuite?rev=668&op=file
==============================================================================
--- trunk/packages/vim-latexsuite/debian/vim-registry/latexsuite (added)
+++ trunk/packages/vim-latexsuite/debian/vim-registry/latexsuite Sat May 13 02:35:03 2006
@@ -1,0 +1,69 @@
+Add-On: latexsuite
+Description: comprehensive set of tools to view, edit, and compile LaTeX documents
+Files: compiler/tex.vim, doc/imaps.txt.gz, doc/latexhelp.txt.gz,
+ doc/latex-suite-quickstart.txt.gz, doc/latex-suite.txt.gz,
+ ftplugin/bib_latexSuite.vim, ftplugin/latex-suite/bibtex.vim,
+ ftplugin/latex-suite/bibtools.py, ftplugin/latex-suite/brackets.vim,
+ ftplugin/latex-suite/compiler.vim, ftplugin/latex-suite/custommacros.vim,
+ ftplugin/latex-suite/diacritics.vim,
+ ftplugin/latex-suite/dictionaries/dictionary,
+ ftplugin/latex-suite/dictionaries/SIunits,
+ ftplugin/latex-suite/elementmacros.vim, ftplugin/latex-suite/envmacros.vim,
+ ftplugin/latex-suite/folding.vim, ftplugin/latex-suite/macros/example,
+ ftplugin/latex-suite/main.vim, ftplugin/latex-suite/mathmacros-utf.vim,
+ ftplugin/latex-suite/mathmacros.vim, ftplugin/latex-suite/multicompile.vim,
+ ftplugin/latex-suite/outline.py, ftplugin/latex-suite/packages/accents,
+ ftplugin/latex-suite/packages/acromake,
+ ftplugin/latex-suite/packages/afterpage, ftplugin/latex-suite/packages/alltt,
+ ftplugin/latex-suite/packages/amsmath, ftplugin/latex-suite/packages/amsthm,
+ ftplugin/latex-suite/packages/amsxtra, ftplugin/latex-suite/packages/arabic,
+ ftplugin/latex-suite/packages/array, ftplugin/latex-suite/packages/babel,
+ ftplugin/latex-suite/packages/bar, ftplugin/latex-suite/packages/bm,
+ ftplugin/latex-suite/packages/bophook,
+ ftplugin/latex-suite/packages/boxedminipage,
+ ftplugin/latex-suite/packages/caption2, ftplugin/latex-suite/packages/cases,
+ ftplugin/latex-suite/packages/ccaption,
+ ftplugin/latex-suite/packages/changebar,
+ ftplugin/latex-suite/packages/chapterbib, ftplugin/latex-suite/packages/cite,
+ ftplugin/latex-suite/packages/color, ftplugin/latex-suite/packages/comma,
+ ftplugin/latex-suite/packages/deleq, ftplugin/latex-suite/packages/drftcite,
+ ftplugin/latex-suite/packages/dropping,
+ ftplugin/latex-suite/packages/enumerate, ftplugin/latex-suite/packages/eqlist,
+ ftplugin/latex-suite/packages/eqparbox, ftplugin/latex-suite/packages/everyshi,
+ ftplugin/latex-suite/packages/exmpl, ftplugin/latex-suite/packages/flafter,
+ ftplugin/latex-suite/packages/float, ftplugin/latex-suite/packages/floatflt,
+ ftplugin/latex-suite/packages/fn2end, ftplugin/latex-suite/packages/footmisc,
+ ftplugin/latex-suite/packages/geometry, ftplugin/latex-suite/packages/german,
+ ftplugin/latex-suite/packages/graphicx, ftplugin/latex-suite/packages/graphpap,
+ ftplugin/latex-suite/packages/harpoon, ftplugin/latex-suite/packages/hhline,
+ ftplugin/latex-suite/packages/histogram,
+ ftplugin/latex-suite/packages/hyperref, ftplugin/latex-suite/packages/ifthen,
+ ftplugin/latex-suite/packages/inputenc,
+ ftplugin/latex-suite/packages/letterspace,
+ ftplugin/latex-suite/packages/lineno, ftplugin/latex-suite/packages/longtable,
+ ftplugin/latex-suite/packages/lscape, ftplugin/latex-suite/packages/manyfoot,
+ ftplugin/latex-suite/packages/moreverb, ftplugin/latex-suite/packages/multibox,
+ ftplugin/latex-suite/packages/multicol, ftplugin/latex-suite/packages/newalg,
+ ftplugin/latex-suite/packages/ngerman, ftplugin/latex-suite/packages/numprint,
+ ftplugin/latex-suite/packages/oldstyle, ftplugin/latex-suite/packages/outliner,
+ ftplugin/latex-suite/packages/overcite, ftplugin/latex-suite/packages/parallel,
+ ftplugin/latex-suite/packages/plain, ftplugin/latex-suite/packages/plates,
+ ftplugin/latex-suite/packages/polski, ftplugin/latex-suite/packages/psgo,
+ ftplugin/latex-suite/packages/schedule, ftplugin/latex-suite/packages/SIunits,
+ ftplugin/latex-suite/packages/textfit, ftplugin/latex-suite/packages/times,
+ ftplugin/latex-suite/packages/tipa, ftplugin/latex-suite/packages/ulem,
+ ftplugin/latex-suite/packages/url, ftplugin/latex-suite/packages/verbatim,
+ ftplugin/latex-suite/packages/version, ftplugin/latex-suite/packages.vim,
+ ftplugin/latex-suite/projecttemplate.vim, ftplugin/latex-suite/pytools.py,
+ ftplugin/latex-suite/smartspace.vim,
+ ftplugin/latex-suite/templates/article.tex,
+ ftplugin/latex-suite/templates/IEEEtran.tex,
+ ftplugin/latex-suite/templates/report.tex,
+ ftplugin/latex-suite/templates/report_two_column.tex,
+ ftplugin/latex-suite/templates.vim, ftplugin/latex-suite/texmenuconf.vim,
+ ftplugin/latex-suite/texproject.vim, ftplugin/latex-suite/texrc,
+ ftplugin/latex-suite/texviewer.vim, ftplugin/latex-suite/version.vim,
+ ftplugin/latex-suite/wizardfuncs.vim, ftplugin/tex/brackets.vim,
+ ftplugin/tex_latexSuite.vim, ftplugin/tex/texviewer.vim, indent/tex.vim,
+ plugin/filebrowser.vim, plugin/imaps.vim, plugin/libList.vim,
+ plugin/remoteOpen.vim, plugin/SyntaxFolds.vim
Modified: trunk/packages/vim/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/NEWS?rev=668&op=diff
==============================================================================
--- trunk/packages/vim/debian/NEWS (original)
+++ trunk/packages/vim/debian/NEWS Sat May 13 02:35:03 2006
@@ -1,3 +1,32 @@
+vim (1:7.0-015+1) unstable; urgency=low
+
+ * "vim" vs "vi"
+
+ Vim now beahaves differently when invoked as "vim" or "vi". In the former
+ case the usual debian configuration (/etc/vim/vimrc, /etc/vim/gvimrc) is
+ sourced. When invoked as "vi" only /etc/vim/virc is sourced, providing a
+ minimal Vim evironment, which strives to be compatible with the original
+ "vi". Run Vim as "vim" if you want a full-fledged environment.
+
+ The actual content of /etc/vim/virc sets 'compatible' and nothing else.
+
+ Note that user configuration files (~/.vimrc) and other files found in the
+ runtimepath are still sourced when Vim is invoked as "vi".
+
+ * /etc/vim/vimrc.local is deprecated
+
+ Vim system-wide configuration viles (/etc/vim/*rc) no longer contain paths
+ whith hard-coded Vim version numbers. They can now be freely modified
+ without risking to loose access to Vim runtime files on version changes
+ (this used to happen in the past if the sysadm failed to merge changes
+ applied in the Debian packages).
+
+ Therefore .local files in /etc/vim/ are no longer needed and can be no
+ longer sourced in future versions of the default Vim configuration in
+ Debian. Please merge .local files in /etc/vim/vimrc and /etc/vim/gvimrc.
+
+ -- Stefano Zacchiroli <zack at debian.org> Fri, 12 May 2006 21:19:55 -0500
+
vim (1:6.4+7.0g01-1) experimental; urgency=low
/etc/vim/vimrc (and gvimrc) no longer contain the default system-wide
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=668&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat May 13 02:35:03 2006
@@ -1,4 +1,4 @@
-vim (1:7.0-012+1) UNRELEASED; urgency=low
+vim (1:7.0-015+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
* New upstream patches (011 - 015), see README.gz for details.
@@ -9,6 +9,11 @@
matchit plugin, so that they are no longer version dependent
+ added dir /var/lib/vim/addons/, now in the runtimepath
+ added vim add-on registry entry for the matchit plugin
+ * Differentiate behaviour of Vim when invoked as "vi"
+ + added patch patches/virc.c.diff which source /etc/vim/virc when invoked
+ as such
+ + added debian/runtime/virc; it creates a vi-like environment setting
+ 'compatible' and nothing else
-- James Vega <jamessan at debian.org> Thu, 12 May 2006 13:45:36 -0400
Added: trunk/packages/vim/debian/runtime/virc
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/runtime/virc?rev=668&op=file
==============================================================================
--- trunk/packages/vim/debian/runtime/virc (added)
+++ trunk/packages/vim/debian/runtime/virc Sat May 13 02:35:03 2006
@@ -1,0 +1,10 @@
+" Vim configuration file, in effect when invoked as "vi". The aim of this
+" configuration file is to provide a Vim environment as compatible with the
+" original vi as possible. Note that ~/.vimrc configuration files as other
+" configuration files in the runtimepath are still sourced.
+" When Vim is invoked differently ("vim", "view", "evim", ...) this file is
+" _not_ sourced; /etc/vim/vimrc and/or /etc/vim/gvimrc are.
+
+set compatible
+
+" vim: set ft=vim:
Modified: trunk/packages/vim/debian/vim-common.install.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-common.install.in?rev=668&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-common.install.in (original)
+++ trunk/packages/vim/debian/vim-common.install.in Sat May 13 02:35:03 2006
@@ -1,6 +1,7 @@
debian/tmp/usr/bin/xxd usr/bin/
debian/helpztags usr/bin/
debian/runtime/vimrc etc/vim/
+debian/runtime/virc etc/vim/
debian/runtime/debian.vim usr/share/vim/@VIMCUR@/
debian/vim.presubj usr/share/bug/vim/
debian/tmp/usr/share/man/man1/* usr/share/man/man1/
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=668&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Sat May 13 02:35:03 2006
@@ -1,1 +1,2 @@
+virc.c.diff -p0
xdefaults.vim.diff -p0
Added: trunk/packages/vim/patches/virc.c.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/virc.c.diff?rev=668&op=file
==============================================================================
--- trunk/packages/vim/patches/virc.c.diff (added)
+++ trunk/packages/vim/patches/virc.c.diff Sat May 13 02:35:03 2006
@@ -1,0 +1,52 @@
+Index: vim/src/os_unix.h
+===================================================================
+--- vim/src/os_unix.h.orig
++++ vim/src/os_unix.h
+@@ -237,6 +237,9 @@
+ /*
+ * Unix system-dependent file names
+ */
++#ifndef SYS_VIRC_FILE
++# define SYS_VIRC_FILE "$VIM/virc"
++#endif
+ #ifndef SYS_VIMRC_FILE
+ # define SYS_VIMRC_FILE "$VIM/vimrc"
+ #endif
+Index: vim/src/main.c
+===================================================================
+--- vim/src/main.c.orig
++++ vim/src/main.c
+@@ -89,6 +89,9 @@
+ #ifdef FEAT_DIFF
+ int diff_mode; /* start with 'diff' set */
+ #endif
++#ifdef SYS_VIRC_FILE
++ int vi_mode; /* started as "vi" */
++#endif
+ } mparm_T;
+
+ /* Values for edit_type. */
+@@ -1423,6 +1426,8 @@
+ }
+ else if (STRNICMP(initstr, "vim", 3) == 0)
+ initstr += 3;
++ else if (STRNICMP(initstr, "vi", 2) == 0)
++ parmp->vi_mode = TRUE;
+
+ /* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
+ if (STRICMP(initstr, "diff") == 0)
+@@ -2606,7 +2611,14 @@
+ * Get system wide defaults, if the file name is defined.
+ */
+ #ifdef SYS_VIMRC_FILE
++# ifdef SYS_VIRC_FILE
++ if (parmp->vi_mode)
++ (void)do_source((char_u *)SYS_VIRC_FILE, FALSE, DOSO_NONE);
++ else
++ (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
++# else
+ (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
++# endif
+ #endif
+ #ifdef MACOS_X
+ (void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
More information about the pkg-vim-maintainers
mailing list