[arch-commits] Commit in vim/repos (5 files)

Tobias Kieslich tobias at archlinux.org
Thu Jun 25 01:39:55 EDT 2009


    Date: Thursday, June 25, 2009 @ 01:39:55
  Author: tobias
Revision: 43546

Merged revisions 43545 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/vim/trunk

........
  r43545 | tobias | 2009-06-24 22:39:29 -0700 (Wed, 24 Jun 2009) | 1 line
  
  upgpkg: vim 7.2.218-1
........

Added:
  vim/repos/testing-x86_64/archlinux.vim
    (from rev 43545, vim/trunk/archlinux.vim)
  vim/repos/testing-x86_64/vimrc
    (from rev 43545, vim/trunk/vimrc)
Modified:
  vim/repos/testing-x86_64/	(properties)
  vim/repos/testing-x86_64/PKGBUILD
  vim/repos/testing-x86_64/fetch_runtime.sh

------------------+
 PKGBUILD         |   14 ++++++++++----
 archlinux.vim    |   28 ++++++++++++++++++++++++++++
 fetch_runtime.sh |    2 +-
 vimrc            |   16 ++++++++++++++++
 4 files changed, 55 insertions(+), 5 deletions(-)


Property changes on: vim/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /vim/trunk:1-37993
   + /vim/trunk:1-43545

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-06-25 05:39:29 UTC (rev 43545)
+++ testing-x86_64/PKGBUILD	2009-06-25 05:39:55 UTC (rev 43546)
@@ -3,7 +3,7 @@
 
 pkgname=vim
 _srcver=7.2
-_patchlevel=166
+_patchlevel=218
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
@@ -20,7 +20,7 @@
 source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \
-        fetch_patches.sh fetch_runtime.sh)
+        fetch_patches.sh fetch_runtime.sh vimrc archlinux.vim)
 
 build()
 {
@@ -60,8 +60,14 @@
 
   _runtimedir="${pkgdir}/usr/share/vim/${_versiondir}/"
   update_runtime
-  install -Dm644 ${_runtimedir}/vimrc_example.vim \
-    ${pkgdir}/etc/vimrc
+  cd ${pkgdir}/usr/share/vim
+  ln -s ${_versiondir} vimcurrent
+  cd ${srcdir}/${_versiondir}
+  #install -Dm644 ${_runtimedir}/vimrc_example.vim \
+  #  ${pkgdir}/etc/vimrc
+  install -Dm644 ${srcdir}/vimrc  ${pkgdir}/etc/vimrc
+  install -Dm644 ${srcdir}/archlinux.vim  \
+                 ${pkgdir}/usr/share/vim/vimcurrent/archlinux.vim
   install -dm755 ${pkgdir}/usr/share/licenses/vim
   cd ${pkgdir}/usr/share/licenses/vim
   ln -s ../../vim/${_versiondir}/doc/uganda.txt license.txt

Copied: vim/repos/testing-x86_64/archlinux.vim (from rev 43545, vim/trunk/archlinux.vim)
===================================================================
--- testing-x86_64/archlinux.vim	                        (rev 0)
+++ testing-x86_64/archlinux.vim	2009-06-25 05:39:55 UTC (rev 43546)
@@ -0,0 +1,28 @@
+" The ArchLinux global vimrc - setting only a few sane defaults
+"
+" Maintainer:      Tobias Kieslich [tobias funnychar archlinux dot org]
+"
+" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION
+" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc
+
+set runtimepath=~/.vim,/usr/share/vim,/usr/share/vim/vimcurrent
+
+" 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 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
+
+
+if has('gui_running')
+  " Make shift-insert work like in Xterm
+  map <S-Insert> <MiddleMouse>
+  map! <S-Insert> <MiddleMouse>
+endif

Modified: testing-x86_64/fetch_runtime.sh
===================================================================
--- testing-x86_64/fetch_runtime.sh	2009-06-25 05:39:29 UTC (rev 43545)
+++ testing-x86_64/fetch_runtime.sh	2009-06-25 05:39:55 UTC (rev 43546)
@@ -110,7 +110,7 @@
     sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" ftplugin/changelog.vim
   fi
   # make Aaron happy
-  wget http://www.vim.org/scripts/download_script.php\?src_id=7766 \
+  wget http://www.vim.org/scripts/download_script.php\?src_id=10872 \
     -O autoload/pythoncomplete.vim
   cd "${_OLDDIR}"
   return 0

Copied: vim/repos/testing-x86_64/vimrc (from rev 43545, vim/trunk/vimrc)
===================================================================
--- testing-x86_64/vimrc	                        (rev 0)
+++ testing-x86_64/vimrc	2009-06-25 05:39:55 UTC (rev 43546)
@@ -0,0 +1,16 @@
+" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just
+" /usr/share/vim/vimcurrent/archlinux.vim) and sourced by the call to :runtime
+" you can find below.  If you wish to change any of those settings, you should
+" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten
+" everytime an upgrade of the vim packages is performed.  It is recommended to
+" make changes after sourcing archlinux.vim since it alters the value of the
+" 'compatible' option.
+
+" 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! archlinux.vim
+
+
+" For more option refer to /usr/share/vim/vimcurrent/vimrc_example.vim or the
+" vim manual
+



More information about the arch-commits mailing list