mass updates/adds

Signed-off-by: Florian Pritz <bluewind@xssn.at>

63 files changed, 4093 insertions, 21 deletions

diff --git a/django-openid-auth/PKGBUILD b/django-openid-auth/PKGBUILD
new file mode 100644
index 0000000..ca3af95
--- /dev/null
+++ b/django-openid-auth/PKGBUILD
@@ -0,0 +1,18 @@
+# Maintainer: Laszlo Papp <djszapi at archlinux us>
+
+pkgname=django-openid-auth
+pkgver=0.1
+pkgrel=2
+pkgdesc="OpenID integration for django.contrib.auth"
+arch=(any)
+url="https://launchpad.net/django-openid-auth"
+license=('GPL')
+depends=('python' 'python-openid')
+source=("http://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz")
+md5sums=('416ba0945237de0ec04bc0a5db3a0b2f')
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+    python setup.py build || return 1
+    python setup.py install --root=$pkgdir --optimize=1 || return 1
+}
diff --git a/django-piston/PKGBUILD b/django-piston/PKGBUILD
new file mode 100644
index 0000000..a635ff5
--- /dev/null
+++ b/django-piston/PKGBUILD
@@ -0,0 +1,18 @@
+# Maintainer: Laszlo Papp <djszapi at archlinux us>
+
+pkgname=django-piston
+pkgver=0.2.2
+pkgrel=1
+pkgdesc="Piston is django mini-framework creating APIs"
+arch=(any)
+url="http://bitbucket.org/jespern/django-piston"
+license=('GPL')
+depends=('python' 'django')
+source=("http://bitbucket.org/jespern/$pkgname/downloads/$pkgname-$pkgver.tar.gz")
+md5sums=('28a2900695fdbcb14ff3c45390e7a4fd')
+
+build() {
+    cd "$srcdir/$pkgname"
+    python setup.py build || return 1
+    python setup.py install --root=$pkgdir --optimize=1 || return 1
+}
diff --git a/django-registration/PKGBUILD b/django-registration/PKGBUILD
index 57ae43f..f8caa8c 100644
--- a/django-registration/PKGBUILD
+++ b/django-registration/PKGBUILD
@@ -1,18 +1,19 @@
 # Contributor: Chaiwat Suttipongsakul <cwt at bashell dot com>
+# Maintainer: Laszlo Papp <djszapi at archlinux us>
+
 pkgname=django-registration
-pkgver=0.7
-pkgrel=3
+pkgver=0.8
+pkgrel=1
 pkgdesc="A simple, generic user-registration application for Django"
 arch=(any)
 url="http://bitbucket.org/ubernostrum/django-registration/wiki/Home"
-license=('BSD')
+license=('GPL')
 depends=('python' 'django')
-source=(http://bitbucket.org/ubernostrum/$pkgname/get/v$pkgver.bz2)
-md5sums=('3e3ec7b40b59671b19e1857fd55cf3d2')
+source=("http://bitbucket.org/ubernostrum/django-registration/downloads/$pkgname-$pkgver-alpha-1.tar.gz")
+md5sums=('e2a31be19ebeda41d235a4c52b7bffe7')
 
-build() { 
-    cd "$srcdir/$pkgname"
+build() {
+    cd "$srcdir/$pkgname-$pkgver-alpha-1"
     python setup.py build || return 1
     python setup.py install --root=$pkgdir --optimize=1 || return 1
-    install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/django-voting-svn/PKGBUILD b/django-voting-svn/PKGBUILD
new file mode 100644
index 0000000..ec25884
--- /dev/null
+++ b/django-voting-svn/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Laszlo Papp <djszapi at archlinux us>
+
+pkgname=django-voting-svn
+pkgver=73
+pkgrel=1
+pkgdesc="A generic voting application for Django projects"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/django-voting/"
+license=('GPL')
+depends=('python')
+
+_svntrunk='http://django-voting.googlecode.com/svn/trunk/'
+_svnmod=${pkgname}
+
+build() {
+  cd $srcdir
+
+  if [ -d $_svnmod/.svn ]; then
+    (cd $_svnmod && svn up -r $pkgver)
+  else
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+  fi
+
+  msg "SVN checkout done or server timeout"
+  cd $_svnmod
+
+    python setup.py install --root=$pkgdir
+
+}
+
diff --git a/dovecot-sieve/PKGBUILD b/dovecot-sieve/PKGBUILD
index 3d9e0ec..0beb6b1 100644
--- a/dovecot-sieve/PKGBUILD
+++ b/dovecot-sieve/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Paul Ezvan <paul@ezvan.fr>
 pkgname=dovecot-sieve
-pkgver=0.1.13
+pkgver=0.1.14
 pkgrel=1
 _dovecotvers=1.2
 pkgdesc="Dovecot sieve plugin"
@@ -9,7 +9,7 @@ url="http://wiki.dovecot.org/LDA/Sieve"
 license=('LGPL')
 depends=("dovecot>=$_dovecotvers")
 source=(http://www.rename-it.nl/dovecot/$_dovecotvers/dovecot-$_dovecotvers-sieve-$pkgver.tar.gz)
-md5sums=('6151ab50e24abc0384358b1618c8048f')
+md5sums=('01a92883fde76a5f985b0343e81b0c3d')
 
 build() {
   
diff --git a/imagemagick-nox/ChangeLog b/imagemagick-nox/ChangeLog
new file mode 100644
index 0000000..f35cadc
--- /dev/null
+++ b/imagemagick-nox/ChangeLog
@@ -0,0 +1,142 @@
+2009-08-05  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.5.4.8-1
+	* Upstream update
+
+2009-07-23  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.5.4.5-1
+	* Upstream update
+
+2009-06-05  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.5.3.2-1
+	* Upstream update
+	* Removed insecure RPATH (close FS#14843)
+
+2009-05-21  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.5.2.7-1
+	* Upstream update
+
+2009-04-29  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.5.1.9-1
+	* Upstream update
+
+2009-03-31  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.5.0.10-1
+	* Upstream update
+
+2009-03-17  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.5.0.1-1
+	* Upstream update
+
+2009-02-27  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.9.7-1
+	* Upstream update
+
+2009-02-07  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.9.2-1
+	* Upstream update
+
+2009-01-30  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.8.10-1
+	* Upstream update
+
+2008-12-29  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.8.2-1
+	* Upstream update
+
+2008-12-14  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.7.8-1
+	* Upstream update
+
+2008-12-05  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.7.0-1
+	* Upstream update
+	* Rebuild against heimdal 1.2.1
+
+2008-11-25  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.6.3-1
+	* Upstream update
+
+2008-11-14  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.5.6-1
+	* Upstream update
+
+2008-10-26  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.5.0-1
+	* Upstream update
+
+2008-10-18  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.4.9-1
+	* Upstream update
+
+2008-10-03  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.4.1-1
+	* Upstream update
+
+2008-09-06  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.3.6-1
+	* Upstream update
+	* Added JPEG2000 support (close FS#10544)
+
+2008-08-19  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.2.10-1
+	* Upstream update
+
+2008-08-11  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.2.7-1
+	* Upstream update
+	* Added bzip2 and libxml2 depends
+	* Disabled docs
+
+2008-07-18  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.2.4-1
+	* Upstream update
+
+2008-06-23  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.2.1-1
+	* Upstream update
+	* Fixed linking problem (close FS#10574)
+
+2008-05-19  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.1.3-1
+	* Upstream update
+
+2008-04-30  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.1.0-1
+	* Upstream update
+
+2008-04-24  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.0.9-1
+	* Upstream update
+
+2008-03-29  Eric Belanger  <eric@archlinux.org>
+
+	* imagemagick 6.4.0.2-1
+	* Upstream update
+	* Added dvips to delegates list for dvi support (close FS#8914)
+	* Added ChangeLog
diff --git a/imagemagick-nox/ImageMagick-6.5.6-1.tar.bz2.part b/imagemagick-nox/ImageMagick-6.5.6-1.tar.bz2.part
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/imagemagick-nox/ImageMagick-6.5.6-1.tar.bz2.part
diff --git a/imagemagick-nox/ImageMagick-6.5.6.1-1.tar.bz2.part b/imagemagick-nox/ImageMagick-6.5.6.1-1.tar.bz2.part
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/imagemagick-nox/ImageMagick-6.5.6.1-1.tar.bz2.part
diff --git a/imagemagick-nox/PKGBUILD b/imagemagick-nox/PKGBUILD
new file mode 100644
index 0000000..ac59e11
--- /dev/null
+++ b/imagemagick-nox/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Eric Belanger <eric@archlinux.org>
+
+# NOTE: To circumvent linking problems (FS#10574), this package must now be built the following way:
+# install old package, build new package, install new package, rebuild
+# Just uninstalling ImageMagick before build fails as it is used during the build processs
+
+pkgname=imagemagick-nox
+pkgver=6.5.7.10
+pkgrel=1
+pkgdesc="An image viewing/manipulation program, without X dependencies"
+arch=('i686' 'x86_64')
+url="http://www.imagemagick.org/"
+license=('custom')
+depends=('lcms>=1.18-2' 'gcc-libs' 'openexr>=1.6.1' 'libtool>=2.2' 'heimdal>=1.2.1' 'bzip2' 'libxml2')
+provides=('imagemagick')
+options=('!makeflags' '!docs')
+source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2 \
+        libpng_mmx_patch_x86_64.patch add_delegate.patch perlmagick.rpath.patch)
+md5sums=('5f2d4d0eacbeea48af5c4cfb37c4afe2' '069980fc2590c02aed86420996259302'\
+         '7f5851c4450b73d52df55c7e806cc316' 'ff9974decbfe9846f8e347239d87e4eb')
+sha1sums=('f3d802f2ba01f63c60847341149021a93967979c' 'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\
+         '19b40dcbc5bf8efb8ce7190fed17e2921de32ea5' '23405f80904b1de94ebd7bd6fe2a332471b8c283')
+
+build() {
+  cd "${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}"
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    patch -Np1 < ../libpng_mmx_patch_x86_64.patch || return 1
+  fi
+
+  patch -p0 < ../add_delegate.patch || return 1
+  patch -p0 < ../perlmagick.rpath.patch || return 1
+  sed -i "s/with_autotrace='no'/with_autotrace='yes'/" configure || return 1
+
+ # When there is a soname bump, remove 'LIBS=-lMagickWand' from configure line and build/install. Then, readd 'LIBS=-lMagickWand' and build/install twice.
+  LIBS=-lMagickWand ./configure --prefix=/usr --without-modules --disable-static --enable-openmp \
+              --without-x --without-wmf --with-openexr --with-xml \
+              --without-gslib --with-perl --with-perl-options="INSTALLDIRS=vendor" \
+              --without-gvc --without-djvu --without-autotrace --with-jp2 \
+              --without-jbig --without-fpx --without-dps || return 1
+
+  make || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  install -D -m644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE" || return 1
+
+  #Cleaning
+  find ${pkgdir} -name '*.bs' -exec rm {} \; || return 1
+  find ${pkgdir} -name '.packlist' -exec rm {} \; || return 1
+  find ${pkgdir} -name 'perllocal.pod' -exec rm {} \; || return 1
+
+  rm -f ${pkgdir}/usr/lib/*.la || return 1
+}
diff --git a/imagemagick-nox/add_delegate.patch b/imagemagick-nox/add_delegate.patch
new file mode 100644
index 0000000..6ba6009
--- /dev/null
+++ b/imagemagick-nox/add_delegate.patch
@@ -0,0 +1,8 @@
+--- config/delegates.xml.in.orig	2008-03-29 23:25:03.000000000 -0400
++++ config/delegates.xml.in	2008-03-29 23:27:35.000000000 -0400
+@@ -103,4 +103,5 @@
+   <delegate decode="xps:color" stealth="True" command="&quot;@XPSDelegate@&quot; -dQUIET -dPARANOIDSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=0 &quot;-sDEVICE=@XPSColorDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+   <delegate decode="xps:cmyk" stealth="True" command="&quot;@XPSDelegate@&quot; -dQUIET -dPARANOIDSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=0 &quot;-sDEVICE=@XPSCMYKDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
+   <delegate decode="xps:mono" stealth="True" command="&quot;@XPSDelegate@&quot; -dQUIET -dPARANOIDSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=0 &quot;-sDEVICE=@XPSMonoDevice@&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
++  <delegate decode="dvi" command="&quot;dvips&quot; -q -o &quot;%o&quot; &quot;%i&quot;"/>
+ </delegatemap>
diff --git a/imagemagick-nox/libpng_mmx_patch_x86_64.patch b/imagemagick-nox/libpng_mmx_patch_x86_64.patch
new file mode 100644
index 0000000..d86449a
--- /dev/null
+++ b/imagemagick-nox/libpng_mmx_patch_x86_64.patch
@@ -0,0 +1,12 @@
+diff -Naur ImageMagick-6.2.7.orig/coders/png.c ImageMagick-6.2.7/coders/png.c
+--- ImageMagick-6.2.7.orig/coders/png.c	2006-05-21 12:35:55.784852536 +0200
++++ ImageMagick-6.2.7/coders/png.c	2006-05-21 12:36:50.698504392 +0200
+@@ -164,6 +164,8 @@
+ #define PNG_MAX_UINT (png_uint_32) 0x7fffffffL
+ #endif
+ 
++#undef PNG_ASSEMBLER_CODE_SUPPORTED
++
+ /*
+   Constant strings for known chunk types.  If you need to add a chunk,
+   add a string holding the name here.   To make the code more
diff --git a/imagemagick-nox/perlmagick.rpath.patch b/imagemagick-nox/perlmagick.rpath.patch
new file mode 100644
index 0000000..958c0f2
--- /dev/null
+++ b/imagemagick-nox/perlmagick.rpath.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	2009-05-26 16:22:11.000000000 -0300
++++ Makefile.in	2009-05-26 16:23:27.000000000 -0300
+@@ -10067,6 +10067,7 @@
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
diff --git a/parched-git/LICENSE b/parched-git/LICENSE
new file mode 100644
index 0000000..787374a
--- /dev/null
+++ b/parched-git/LICENSE
@@ -0,0 +1,24 @@
+Copyright 1996-2002 Software in the Public Interest, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Software in the Public
+Interest, Inc. shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from Software in the Public Interest, Inc.
diff --git a/parched-git/PKGBUILD b/parched-git/PKGBUILD
new file mode 100644
index 0000000..1ba775f
--- /dev/null
+++ b/parched-git/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Laszlo Papp <djszapi at archlinux dot us>
+
+pkgname=parched-git
+pkgver=20100107
+pkgrel=1
+pkgdesc="A Pacman package and PKGBUILD parser module"
+arch=('i686' 'x86_64')
+url="http://github.com/sebnow/parched"
+license=('MIT')
+depends=('git' 'python')
+source=(LICENSE)
+md5sums=('31eccf56949504b5ce33110068948cf2')
+
+_gitroot="git://github.com/sebnow/parched.git"
+_gitname="parched"
+
+build() {
+    cd "$srcdir"
+    msg "Connecting to the parched git repository..."
+
+    if [ -d "$srcdir/$_gitname" ] ; then
+        cd $_gitname && git pull origin
+        msg "The local files are updated."
+    else
+        git clone $_gitroot
+    fi
+
+    msg "GIT checkout done or server timeout"
+    msg "Starting make..."
+
+    cd $srcdir/$_gitname
+	python setup.py build || return 1
+	python setup.py install --root=$pkgdir --optimize=1 || return 1
+	install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/perl-ack/ChangeLog b/perl-ack/ChangeLog
index 9561365..62c4e9f 100644
--- a/perl-ack/ChangeLog
+++ b/perl-ack/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-20 Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
+
+	* 1.92-1 :
+	Updated to the latest version.
+
+
 2009-09-11 Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 	* 1.90-1 :
diff --git a/perl-ack/PKGBUILD b/perl-ack/PKGBUILD
index a01ace2..463514a 100644
--- a/perl-ack/PKGBUILD
+++ b/perl-ack/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=perl-ack
 _pkgname=ack
-pkgver=1.90
+pkgver=1.92
 pkgrel=1
 pkgdesc='A grep-like tool tailored to working with large trees of source'
 arch=('any')
@@ -12,7 +12,7 @@ depends=('perl>=5.10.0' 'perl-file-next')
 options=(!emptydirs)
 
 source=(http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/${_pkgname}-$pkgver.tar.gz)
-md5sums=('94d2790e5e3c74561ca0cd465a494db6')
+md5sums=('c25b5a16d0a27386a75c91d531b86cea')
 
 build() {
   cd $srcdir/${_pkgname}-$pkgver
diff --git a/php-imagick/PKGBUILD b/php-imagick/PKGBUILD
new file mode 100644
index 0000000..80936d1
--- /dev/null
+++ b/php-imagick/PKGBUILD
@@ -0,0 +1,25 @@
+# Contributor: Evangelos Foutras <foutrelis@gmail.com>
+
+pkgname=php-imagick
+pkgver=2.3.0
+pkgrel=1
+pkgdesc="PHP extension for IMagick"
+arch=('i686' 'x86_64')
+url="http://pecl.php.net/package/imagick"
+license=('PHP')
+depends=('php' 'imagemagick')
+backup=('etc/php/conf.d/memcached.ini')
+install=php-imagick.install
+source=(http://pecl.php.net/get/imagick-$pkgver.tgz)
+
+build() {
+  cd "$srcdir/imagick-$pkgver"
+
+  phpize || return 1
+  ./configure --prefix=/usr
+  make || return 1
+  make INSTALL_ROOT="$pkgdir" install
+  echo ';extension=imagick.so' > imagick.ini
+  install -D -m644 imagick.ini "$pkgdir/etc/php/conf.d/imagick.ini"
+}
+md5sums=('1493a21b37e209cc59764ac1ca2a1af9')
diff --git a/php-imagick/php-imagick.install b/php-imagick/php-imagick.install
new file mode 100644
index 0000000..266402b
--- /dev/null
+++ b/php-imagick/php-imagick.install
@@ -0,0 +1,14 @@
+post_install() {
+  echo '
+    ==> PHP extension
+
+    A config file was stored under /etc/php/conf.d/. In order to use this
+    extension make sure to uncomment it from its config file.
+    '
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/php-suhosin/PKGBUILD b/php-suhosin/PKGBUILD
new file mode 100644
index 0000000..8925d13
--- /dev/null
+++ b/php-suhosin/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=php-suhosin
+pkgver=0.9.29
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='An advanced protection system for PHP installations'
+url='http://www.hardened-php.net/suhosin/'
+license='PHP'
+source=("http://download.suhosin.org/suhosin-${pkgver}.tgz")
+depends=('php>=5.3.0')
+conflicts=('php-suhosin-extension')
+replaces=('php-suhosin-extension')
+backup=('etc/php/conf.d/suhosin.ini')
+md5sums=('e3c599e7e344e981f935b2dab90592c1')
+
+build() {
+	cd ${srcdir}/suhosin-${pkgver}
+	phpize || return 1
+	./configure --prefix=/usr --enable-suhosin || return 1
+	make || return 1
+	make INSTALL_ROOT=${pkgdir} install || return 1
+	# disable by default
+	sed -i 's|extension = suhosin.so|;extension=suhosin.so|g' suhosin.ini
+	install -D -m644 suhosin.ini ${pkgdir}/etc/php/conf.d/suhosin.ini
+}
diff --git a/php/mysqlnd-socket.patch b/php/mysqlnd-socket.patch
new file mode 100644
index 0000000..7573ca1
--- /dev/null
+++ b/php/mysqlnd-socket.patch
@@ -0,0 +1,11 @@
+--- ext/mysqlnd/mysqlnd.c	2009-11-19 14:02:01.934775092 +0100
++++ ext/mysqlnd/mysqlnd.c	2009-11-19 14:08:04.598072581 +0100
+@@ -547,7 +547,7 @@
+ #ifndef PHP_WIN32
+ 	if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) {
+ 		if (!socket) {
+-			socket = "/tmp/mysql.sock";
++			socket = "/var/run/mysqld/mysqld.sock";
+ 		}
+ 		transport_len = spprintf(&transport, 0, "unix://%s", socket);
+ 		unix_socket = TRUE;
diff --git a/pyunit/PKGBUILD b/pyunit/PKGBUILD
new file mode 100644
index 0000000..331808b
--- /dev/null
+++ b/pyunit/PKGBUILD
@@ -0,0 +1,17 @@
+# Maintainer: Laszlo Papp < djszapi at archlinux us >
+
+pkgname=pyunit
+pkgver=1.4.1
+pkgrel=1
+pkgdesc="Standard unit testing framework for Python"
+arch=('any')
+url="http://www.logilab.org/project/pylint"
+license=('GPL')
+source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz?use_mirror=surfnet)
+md5sums=('658ff16afc469a3898260cc72bbea993')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+}
+
diff --git a/pyunit/pyunit-1.4.1.tar.gz?use_mirror=surfnet b/pyunit/pyunit-1.4.1.tar.gz?use_mirror=surfnet
new file mode 100644
index 0000000..50c259e
--- /dev/null
+++ b/pyunit/pyunit-1.4.1.tar.gz?use_mirror=surfnet
diff --git a/spamass-milter/message.diff b/spamass-milter/message.diff
new file mode 100644
index 0000000..53a32c3
--- /dev/null
+++ b/spamass-milter/message.diff
@@ -0,0 +1,15 @@
+--- src/spamass-milter-0.3.1/spamass-milter.cpp	2006-03-23 22:41:36.000000000 +0100
++++ src_new/spamass-milter-0.3.1/spamass-milter.cpp	2010-01-02 01:52:00.000000000 +0100
+@@ -451,8 +451,10 @@
+ 	}
+ 	if (do_reject)
+ 	{
+-		debug(D_MISC, "Rejecting");
+-		smfi_setreply(ctx, "550", "5.7.1", "Blocked by SpamAssassin");
++		const char *spam_status = assassin->spam_status().c_str();
++		debug(D_MISC, "Rejecting %s", smfi_getsymval(ctx,"i"));
++		debug(D_MISC, spam_status);
++		smfi_setreply(ctx, "550", "5.7.1", "Your message seems to be Spam. Please contact postmaster@server-speed.net for more information.");
+ 
+ 
+ 		if (flag_bucket)
diff --git a/vim-nerdtree/PKGBUILD b/vim-nerdtree/PKGBUILD
index c9d5671..a321e33 100644
--- a/vim-nerdtree/PKGBUILD
+++ b/vim-nerdtree/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=vim-nerdtree
 pkgver=4.0.0
 _scriptid=11500
-pkgrel=1
+pkgrel=3
 pkgdesc="A tree explorer plugin for navigating the filesystem"
 arch=('i686' 'x86_64')
 url="http://www.vim.org/scripts/script.php?script_id=1658"
@@ -12,12 +12,14 @@ groups=('vim-plugins')
 install=vimdoc.install
 source=(${pkgname}.zip::http://www.vim.org/scripts/download_script.php?src_id=${_scriptid}
         license.txt)
-md5sums=('985c217d687eceeb3146145a8bbe6cd9'
+md5sums=('a359ce8f9bf5ccf238a53df5dd94725a'
          'efbd5986e691ce8c876fb86e8f5961ea')
 
 build() {
-    install -d ${pkgdir}/usr/share/vim/vimfiles/{doc,plugin} || return 1
+    install -d ${pkgdir}/usr/share/vim/vimfiles/{doc,nerdtree_plugin,plugin} || return 1
     install -Dm755 ${srcdir}/doc/* ${pkgdir}/usr/share/vim/vimfiles/doc/ || return 1
+	install -Dm755 ${srcdir}/nerdtree_plugin/* \
+	${pkgdir}/usr/share/vim/vimfiles/nerdtree_plugin/ || return 1
     install -Dm755 ${srcdir}/plugin/* ${pkgdir}/usr/share/vim/vimfiles/plugin/ || return 1
     install -Dm755 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt || return 1
 }
diff --git a/vim-nerdtree/vimdoc.install b/vim-nerdtree/vimdoc.install
index 1140029..220693c 100644
--- a/vim-nerdtree/vimdoc.install
+++ b/vim-nerdtree/vimdoc.install
@@ -1,6 +1,6 @@
 post_install() {
     echo -n "Updating vim help tags..."
-    /usr/bin/vim/vimfiles --noplugins -u NONE -U NONE \
+    /usr/bin/vim --noplugins -u NONE -U NONE \
         --cmd ":helptags /usr/share/vim/vimfiles/doc" --cmd ":q" > /dev/null 2>&1
     echo "done."
 }
diff --git a/vim/vim-7.2/7.2.235 b/vim/vim-7.2/7.2.235
new file mode 100644
index 0000000..6aa8338
--- /dev/null
+++ b/vim/vim-7.2/7.2.235
@@ -0,0 +1,94 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.235
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.235
+Problem:    Using CTRL-O z= in Insert mode has a delay before redrawing.
+Solution:   Reset msg_didout and msg_scroll.
+Files:	    src/misc1.c, src/spell.c
+
+
+*** ../vim-7.2.234/src/misc1.c	2009-07-14 21:40:30.000000000 +0200
+--- src/misc1.c	2009-07-14 15:51:55.000000000 +0200
+***************
+*** 3276,3281 ****
+--- 3276,3282 ----
+  	cmdline_row = msg_row - 1;
+  	need_wait_return = FALSE;
+  	msg_didany = FALSE;
++ 	msg_didout = FALSE;
+      }
+      else
+  	cmdline_row = save_cmdline_row;
+*** ../vim-7.2.234/src/spell.c	2009-05-17 13:30:58.000000000 +0200
+--- src/spell.c	2009-07-14 15:57:55.000000000 +0200
+***************
+*** 10252,10257 ****
+--- 10252,10258 ----
+      int		limit;
+      int		selected = count;
+      int		badlen = 0;
++     int		msg_scroll_save = msg_scroll;
+  
+      if (no_spell_checking(curwin))
+  	return;
+***************
+*** 10416,10422 ****
+  	selected = prompt_for_number(&mouse_used);
+  	if (mouse_used)
+  	    selected -= lines_left;
+! 	lines_left = Rows;	/* avoid more prompt */
+      }
+  
+      if (selected > 0 && selected <= sug.su_ga.ga_len && u_save_cursor() == OK)
+--- 10417,10425 ----
+  	selected = prompt_for_number(&mouse_used);
+  	if (mouse_used)
+  	    selected -= lines_left;
+! 	lines_left = Rows;		/* avoid more prompt */
+! 	/* don't delay for 'smd' in normal_cmd() */
+! 	msg_scroll = msg_scroll_save;
+      }
+  
+      if (selected > 0 && selected <= sug.su_ga.ga_len && u_save_cursor() == OK)
+***************
+*** 10441,10447 ****
+  	}
+  
+  	/* Replace the word. */
+! 	p = alloc((unsigned)STRLEN(line) - stp->st_orglen + stp->st_wordlen + 1);
+  	if (p != NULL)
+  	{
+  	    c = (int)(sug.su_badptr - line);
+--- 10444,10451 ----
+  	}
+  
+  	/* Replace the word. */
+! 	p = alloc((unsigned)STRLEN(line) - stp->st_orglen
+! 						       + stp->st_wordlen + 1);
+  	if (p != NULL)
+  	{
+  	    c = (int)(sug.su_badptr - line);
+*** ../vim-7.2.234/src/version.c	2009-07-14 21:40:30.000000000 +0200
+--- src/version.c	2009-07-22 11:00:34.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     235,
+  /**/
+
+-- 
+From "know your smileys":
+ |-(	Contact lenses, but has lost them
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.236 b/vim/vim-7.2/7.2.236
new file mode 100644
index 0000000..aeb1f57
--- /dev/null
+++ b/vim/vim-7.2/7.2.236
@@ -0,0 +1,81 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.236
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.236
+Problem:    Mac: Compiling with Ruby doesn't always work.
+Solution:   In configure filter out the --arch argument (Bjorn Winckler)
+Files:	    src/configure.in, src/auto/configure
+
+
+*** ../vim-7.2.235/src/configure.in	2009-05-26 22:58:43.000000000 +0200
+--- src/configure.in	2009-07-14 16:09:34.000000000 +0200
+***************
+*** 984,990 ****
+  	fi
+  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
+  	if test "X$rubyldflags" != "X"; then
+! 	  LDFLAGS="$rubyldflags $LDFLAGS"
+  	fi
+  	RUBY_SRC="if_ruby.c"
+  	RUBY_OBJ="objects/if_ruby.o"
+--- 984,996 ----
+  	fi
+  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
+  	if test "X$rubyldflags" != "X"; then
+! 	  dnl Ruby on Mac OS X 10.5 adds "-arch" flags but these should only
+! 	  dnl be included if requested by passing --with-mac-arch to
+! 	  dnl configure, so strip these flags first (if present)
+! 	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'`
+! 	  if test "X$rubyldflags" != "X"; then
+! 	    LDFLAGS="$rubyldflags $LDFLAGS"
+! 	  fi
+  	fi
+  	RUBY_SRC="if_ruby.c"
+  	RUBY_OBJ="objects/if_ruby.o"
+*** ../vim-7.2.235/src/auto/configure	2009-05-26 22:58:43.000000000 +0200
+--- src/auto/configure	2009-07-14 16:11:58.000000000 +0200
+***************
+*** 5780,5786 ****
+  	fi
+  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
+  	if test "X$rubyldflags" != "X"; then
+! 	  LDFLAGS="$rubyldflags $LDFLAGS"
+  	fi
+  	RUBY_SRC="if_ruby.c"
+  	RUBY_OBJ="objects/if_ruby.o"
+--- 5780,5789 ----
+  	fi
+  	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
+  	if test "X$rubyldflags" != "X"; then
+! 	  	  	  	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'`
+! 	  if test "X$rubyldflags" != "X"; then
+! 	    LDFLAGS="$rubyldflags $LDFLAGS"
+! 	  fi
+  	fi
+  	RUBY_SRC="if_ruby.c"
+  	RUBY_OBJ="objects/if_ruby.o"
+*** ../vim-7.2.235/src/version.c	2009-07-22 11:03:38.000000000 +0200
+--- src/version.c	2009-07-22 11:14:38.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     236,
+  /**/
+
+-- 
+From "know your smileys":
+ <|-) Chinese
+ <|-( Chinese and doesn't like these kind of jokes
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.237 b/vim/vim-7.2/7.2.237
new file mode 100644
index 0000000..3592d3d
--- /dev/null
+++ b/vim/vim-7.2/7.2.237
@@ -0,0 +1,76 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.237
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.237
+Problem:    Crash on exit when window icon not set.
+Solution:   Copy terminal name when using it for the icon name.
+Files:	    src/os_unix.c
+
+
+*** ../vim-7.2.236/src/os_unix.c	2009-07-14 17:38:51.000000000 +0200
+--- src/os_unix.c	2009-07-14 18:30:04.000000000 +0200
+***************
+*** 1734,1742 ****
+      if (oldicon == NULL && !test_only)
+      {
+  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
+! 	    oldicon = T_NAME + 8;
+  	else
+! 	    oldicon = T_NAME;
+      }
+  
+      return retval;
+--- 1734,1742 ----
+      if (oldicon == NULL && !test_only)
+      {
+  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
+! 	    oldicon = vim_strsave(T_NAME + 8);
+  	else
+! 	    oldicon = vim_strsave(T_NAME);
+      }
+  
+      return retval;
+***************
+*** 1939,1947 ****
+      if (!test_only)
+      {
+  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
+! 	    oldicon = T_NAME + 8;
+  	else
+! 	    oldicon = T_NAME;
+      }
+      return FALSE;
+  }
+--- 1939,1947 ----
+      if (!test_only)
+      {
+  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
+! 	    oldicon = vim_strsave(T_NAME + 8);
+  	else
+! 	    oldicon = vim_strsave(T_NAME);
+      }
+      return FALSE;
+  }
+*** ../vim-7.2.236/src/version.c	2009-07-22 11:16:54.000000000 +0200
+--- src/version.c	2009-07-22 13:26:30.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     237,
+  /**/
+
+-- 
+Common sense is what tells you that the world is flat.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.238 b/vim/vim-7.2/7.2.238
new file mode 100644
index 0000000..a70976d
--- /dev/null
+++ b/vim/vim-7.2/7.2.238
@@ -0,0 +1,117 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.238
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.238
+Problem:    Leaking memory when setting term to "builtin_dumb".
+Solution:   Free memory when resetting term option t_Co.
+Files:	    src/option.c, src/proto/option.pro, src/term.c
+
+
+*** ../vim-7.2.237/src/option.c	2009-06-16 17:50:56.000000000 +0200
+--- src/option.c	2009-07-22 12:49:19.000000000 +0200
+***************
+*** 403,410 ****
+  #define P_NUM		0x02	/* the option is numeric */
+  #define P_STRING	0x04	/* the option is a string */
+  #define P_ALLOCED	0x08	/* the string option is in allocated memory,
+! 				    must use vim_free() when assigning new
+! 				    value. Not set if default is the same. */
+  #define P_EXPAND	0x10	/* environment expansion.  NOTE: P_EXPAND can
+  				   never be used for local or hidden options! */
+  #define P_NODEFAULT	0x40	/* don't set to default value */
+--- 403,411 ----
+  #define P_NUM		0x02	/* the option is numeric */
+  #define P_STRING	0x04	/* the option is a string */
+  #define P_ALLOCED	0x08	/* the string option is in allocated memory,
+! 				   must use free_string_option() when
+! 				   assigning new value. Not set if default is
+! 				   the same. */
+  #define P_EXPAND	0x10	/* environment expansion.  NOTE: P_EXPAND can
+  				   never be used for local or hidden options! */
+  #define P_NODEFAULT	0x40	/* don't set to default value */
+***************
+*** 8927,8932 ****
+--- 8928,8955 ----
+  }
+  
+  /*
++  * Free the string for one term option, if it was allocated.
++  * Set the string to empty_option and clear allocated flag.
++  * "var" points to the option value.
++  */
++     void
++ free_one_termoption(var)
++     char_u *var;
++ {
++     struct vimoption   *p;
++ 
++     for (p = &options[0]; p->fullname != NULL; p++)
++ 	if (p->var == var)
++ 	{
++ 	    if (p->flags & P_ALLOCED)
++ 		free_string_option(*(char_u **)(p->var));
++ 	    *(char_u **)(p->var) = empty_option;
++ 	    p->flags &= ~P_ALLOCED;
++ 	    break;
++ 	}
++ }
++ 
++ /*
+   * Set the terminal option defaults to the current value.
+   * Used after setting the terminal name.
+   */
+*** ../vim-7.2.237/src/proto/option.pro	2009-02-21 20:27:00.000000000 +0100
+--- src/proto/option.pro	2009-07-22 12:52:31.000000000 +0200
+***************
+*** 29,34 ****
+--- 29,35 ----
+  int makefoldset __ARGS((FILE *fd));
+  void clear_termoptions __ARGS((void));
+  void free_termoptions __ARGS((void));
++ void free_one_termoption __ARGS((char_u *var));
+  void set_term_defaults __ARGS((void));
+  void comp_col __ARGS((void));
+  char_u *get_equalprg __ARGS((void));
+*** ../vim-7.2.237/src/term.c	2009-06-16 14:31:56.000000000 +0200
+--- src/term.c	2009-07-22 13:19:59.000000000 +0200
+***************
+*** 2881,2887 ****
+  
+  	/* if 'Sb' and 'AB' are not defined, reset "Co" */
+  	if (*T_CSB == NUL && *T_CAB == NUL)
+! 	    T_CCO = empty_option;
+  
+  	/* Set 'weirdinvert' according to value of 't_xs' */
+  	p_wiv = (*T_XS != NUL);
+--- 2881,2887 ----
+  
+  	/* if 'Sb' and 'AB' are not defined, reset "Co" */
+  	if (*T_CSB == NUL && *T_CAB == NUL)
+! 	    free_one_termoption(T_CCO);
+  
+  	/* Set 'weirdinvert' according to value of 't_xs' */
+  	p_wiv = (*T_XS != NUL);
+*** ../vim-7.2.237/src/version.c	2009-07-22 13:27:50.000000000 +0200
+--- src/version.c	2009-07-22 14:25:44.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     238,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+95. Only communication in your household is through email.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.239 b/vim/vim-7.2/7.2.239
new file mode 100644
index 0000000..26b80ee
--- /dev/null
+++ b/vim/vim-7.2/7.2.239
@@ -0,0 +1,145 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.239
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.239
+Problem:    Using :diffpatch twice or when patching fails causes memory
+	    corruption and/or a crash.  (Bryan Venteicher)
+Solution:   Detect missing output file.  Avoid using non-existing buffer.
+Files:	    src/diff.c
+
+
+*** ../vim-7.2.238/src/diff.c	2009-05-14 22:19:19.000000000 +0200
+--- src/diff.c	2009-07-22 16:06:21.000000000 +0200
+***************
+*** 893,898 ****
+--- 893,899 ----
+      char_u	*browseFile = NULL;
+      int		browse_flag = cmdmod.browse;
+  #endif
++     struct stat st;
+  
+  #ifdef FEAT_BROWSE
+      if (cmdmod.browse)
+***************
+*** 999,1042 ****
+      STRCAT(buf, ".rej");
+      mch_remove(buf);
+  
+!     if (curbuf->b_fname != NULL)
+      {
+! 	newname = vim_strnsave(curbuf->b_fname,
+  					  (int)(STRLEN(curbuf->b_fname) + 4));
+! 	if (newname != NULL)
+! 	    STRCAT(newname, ".new");
+!     }
+  
+  #ifdef FEAT_GUI
+!     need_mouse_correct = TRUE;
+  #endif
+!     /* don't use a new tab page, each tab page has its own diffs */
+!     cmdmod.tab = 0;
+! 
+!     if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
+!     {
+! 	/* Pretend it was a ":split fname" command */
+! 	eap->cmdidx = CMD_split;
+! 	eap->arg = tmp_new;
+! 	do_exedit(eap, old_curwin);
+  
+! 	if (curwin != old_curwin)		/* split must have worked */
+  	{
+! 	    /* Set 'diff', 'scrollbind' on and 'wrap' off. */
+! 	    diff_win_options(curwin, TRUE);
+! 	    diff_win_options(old_curwin, TRUE);
+  
+! 	    if (newname != NULL)
+  	    {
+! 		/* do a ":file filename.new" on the patched buffer */
+! 		eap->arg = newname;
+! 		ex_file(eap);
+  
+  #ifdef FEAT_AUTOCMD
+! 		/* Do filetype detection with the new name. */
+! 		if (au_has_group((char_u *)"filetypedetect"))
+! 		    do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
+  #endif
+  	    }
+  	}
+      }
+--- 1000,1050 ----
+      STRCAT(buf, ".rej");
+      mch_remove(buf);
+  
+!     /* Only continue if the output file was created. */
+!     if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
+! 	EMSG(_("E816: Cannot read patch output"));
+!     else
+      {
+! 	if (curbuf->b_fname != NULL)
+! 	{
+! 	    newname = vim_strnsave(curbuf->b_fname,
+  					  (int)(STRLEN(curbuf->b_fname) + 4));
+! 	    if (newname != NULL)
+! 		STRCAT(newname, ".new");
+! 	}
+  
+  #ifdef FEAT_GUI
+! 	need_mouse_correct = TRUE;
+  #endif
+! 	/* don't use a new tab page, each tab page has its own diffs */
+! 	cmdmod.tab = 0;
+  
+! 	if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
+  	{
+! 	    /* Pretend it was a ":split fname" command */
+! 	    eap->cmdidx = CMD_split;
+! 	    eap->arg = tmp_new;
+! 	    do_exedit(eap, old_curwin);
+  
+! 	    /* check that split worked and editing tmp_new */
+! 	    if (curwin != old_curwin && win_valid(old_curwin))
+  	    {
+! 		/* Set 'diff', 'scrollbind' on and 'wrap' off. */
+! 		diff_win_options(curwin, TRUE);
+! 		diff_win_options(old_curwin, TRUE);
+! 
+! 		if (newname != NULL)
+! 		{
+! 		    /* do a ":file filename.new" on the patched buffer */
+! 		    eap->arg = newname;
+! 		    ex_file(eap);
+  
+  #ifdef FEAT_AUTOCMD
+! 		    /* Do filetype detection with the new name. */
+! 		    if (au_has_group((char_u *)"filetypedetect"))
+! 			do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
+  #endif
++ 		}
+  	    }
+  	}
+      }
+*** ../vim-7.2.238/src/version.c	2009-07-22 14:27:33.000000000 +0200
+--- src/version.c	2009-07-22 16:21:29.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     239,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+97. Your mother tells you to remember something, and you look for
+    a File/Save command.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.240 b/vim/vim-7.2/7.2.240
new file mode 100644
index 0000000..7a1c22e
--- /dev/null
+++ b/vim/vim-7.2/7.2.240
@@ -0,0 +1,69 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.240
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.240
+Problem:    Crash when using find/replace dialog repeatedly. (Michiel
+	    Hartsuiker)
+Solution:   Avoid doing the operation while busy or recursively.  Also refuse
+	    replace when text is locked.
+Files:	    src/gui.c
+
+
+*** ../vim-7.2.239/src/gui.c	2009-06-24 18:31:36.000000000 +0200
+--- src/gui.c	2009-07-22 16:54:16.000000000 +0200
+***************
+*** 5004,5009 ****
+--- 5004,5022 ----
+      char_u	*p;
+      regmatch_T	regmatch;
+      int		save_did_emsg = did_emsg;
++     static int  busy = FALSE;
++ 
++     /* When the screen is being updated we should not change buffers and
++      * windows structures, it may cause freed memory to be used.  Also don't
++      * do this recursively (pressing "Find" quickly several times. */
++     if (updating_screen || busy)
++ 	return FALSE;
++ 
++     /* refuse replace when text cannot be changed */
++     if ((type == FRD_REPLACE || type == FRD_REPLACEALL) && text_locked())
++ 	return FALSE;
++ 
++     busy = TRUE;
+  
+      ga_init2(&ga, 1, 100);
+      if (type == FRD_REPLACEALL)
+***************
+*** 5094,5099 ****
+--- 5107,5113 ----
+      }
+  
+      vim_free(ga.ga_data);
++     busy = FALSE;
+      return (ga.ga_len > 0);
+  }
+  
+*** ../vim-7.2.239/src/version.c	2009-07-22 16:22:33.000000000 +0200
+--- src/version.c	2009-07-29 11:09:13.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     240,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+113. You are asked about a bus schedule, you wonder if it is 16 or 32 bits.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.241 b/vim/vim-7.2/7.2.241
new file mode 100644
index 0000000..42e9ade
--- /dev/null
+++ b/vim/vim-7.2/7.2.241
@@ -0,0 +1,169 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.241
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.241
+Problem:    When using a combination of ":bufdo" and "doautoall" we may end up
+	    in the wrong directory. (Ajit Thakkar)
+	    Crash when triggering an autocommand in ":vimgrep".  (Yukihiro
+	    Nakadaira)
+Solution:   Clear w_localdir and globaldir when using the aucmd_win.
+	    Use a separate flag to decide aucmd_win needs to be restored.
+Files:	    src/fileio.c, src/globals.h, src/structs.h
+
+
+*** ../vim-7.2.240/src/fileio.c	2009-07-01 17:11:40.000000000 +0200
+--- src/fileio.c	2009-07-22 19:08:55.000000000 +0200
+***************
+*** 8420,8425 ****
+--- 8420,8429 ----
+  	if (aucmd_win == NULL)
+  	    win = curwin;
+      }
++     if (win == NULL && aucmd_win_used)
++ 	/* Strange recursive autocommand, fall back to using the current
++ 	 * window.  Expect a few side effects... */
++ 	win = curwin;
+  
+      aco->save_curwin = curwin;
+      aco->save_curbuf = curbuf;
+***************
+*** 8428,8433 ****
+--- 8432,8438 ----
+  	/* There is a window for "buf" in the current tab page, make it the
+  	 * curwin.  This is preferred, it has the least side effects (esp. if
+  	 * "buf" is curbuf). */
++ 	aco->use_aucmd_win = FALSE;
+  	curwin = win;
+      }
+      else
+***************
+*** 8436,8444 ****
+--- 8441,8460 ----
+  	 * effects, insert it in a the current tab page.
+  	 * Anything related to a window (e.g., setting folds) may have
+  	 * unexpected results. */
++ 	aco->use_aucmd_win = TRUE;
++ 	aucmd_win_used = TRUE;
+  	aucmd_win->w_buffer = buf;
+  	++buf->b_nwindows;
+  	win_init_empty(aucmd_win); /* set cursor and topline to safe values */
++ 	vim_free(aucmd_win->w_localdir);
++ 	aucmd_win->w_localdir = NULL;
++ 
++ 	/* Make sure w_localdir and globaldir are NULL to avoid a chdir() in
++ 	 * win_enter_ext(). */
++ 	aucmd_win->w_localdir = NULL;
++ 	aco->globaldir = globaldir;
++ 	globaldir = NULL;
++ 
+  
+  #ifdef FEAT_WINDOWS
+  	/* Split the current window, put the aucmd_win in the upper half.
+***************
+*** 8472,8478 ****
+      int dummy;
+  #endif
+  
+!     if (aco->new_curwin == aucmd_win)
+      {
+  	--curbuf->b_nwindows;
+  #ifdef FEAT_WINDOWS
+--- 8488,8494 ----
+      int dummy;
+  #endif
+  
+!     if (aco->use_aucmd_win)
+      {
+  	--curbuf->b_nwindows;
+  #ifdef FEAT_WINDOWS
+***************
+*** 8499,8504 ****
+--- 8515,8521 ----
+  	/* Remove the window and frame from the tree of frames. */
+  	(void)winframe_remove(curwin, &dummy, NULL);
+  	win_remove(curwin, NULL);
++ 	aucmd_win_used = FALSE;
+  	last_status(FALSE);	    /* may need to remove last status line */
+  	restore_snapshot(SNAP_AUCMD_IDX, FALSE);
+  	(void)win_comp_pos();   /* recompute window positions */
+***************
+*** 8517,8522 ****
+--- 8534,8542 ----
+  #endif
+  	curbuf = curwin->w_buffer;
+  
++ 	vim_free(globaldir);
++ 	globaldir = aco->globaldir;
++ 
+  	/* the buffer contents may have changed */
+  	check_cursor();
+  	if (curwin->w_topline > curbuf->b_ml.ml_line_count)
+***************
+*** 8541,8547 ****
+  #endif
+  	{
+  	    /* Restore the buffer which was previously edited by curwin, if
+! 	     * it was chagned, we are still the same window and the buffer is
+  	     * valid. */
+  	    if (curwin == aco->new_curwin
+  		    && curbuf != aco->new_curbuf
+--- 8561,8567 ----
+  #endif
+  	{
+  	    /* Restore the buffer which was previously edited by curwin, if
+! 	     * it was changed, we are still the same window and the buffer is
+  	     * valid. */
+  	    if (curwin == aco->new_curwin
+  		    && curbuf != aco->new_curbuf
+*** ../vim-7.2.240/src/globals.h	2009-06-16 16:01:34.000000000 +0200
+--- src/globals.h	2009-07-22 19:50:53.000000000 +0200
+***************
+*** 541,546 ****
+--- 541,547 ----
+  
+  #ifdef FEAT_AUTOCMD
+  EXTERN win_T	*aucmd_win;	/* window used in aucmd_prepbuf() */
++ EXTERN int	aucmd_win_used INIT(= FALSE);	/* aucmd_win is being used */
+  #endif
+  
+  /*
+*** ../vim-7.2.240/src/structs.h	2009-07-09 18:24:24.000000000 +0200
+--- src/structs.h	2009-07-22 18:58:35.000000000 +0200
+***************
+*** 2288,2296 ****
+--- 2288,2298 ----
+  {
+      buf_T	*save_curbuf;	/* saved curbuf */
+  #ifdef FEAT_AUTOCMD
++     int		use_aucmd_win;	/* using aucmd_win */
+      win_T	*save_curwin;	/* saved curwin */
+      win_T	*new_curwin;	/* new curwin */
+      buf_T	*new_curbuf;	/* new curbuf */
++     char_u	*globaldir;	/* saved value of globaldir */
+  #endif
+  } aco_save_T;
+  
+*** ../vim-7.2.240/src/version.c	2009-07-29 11:10:31.000000000 +0200
+--- src/version.c	2009-07-29 12:06:31.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     241,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+114. You are counting items, you go "0,1,2,3,4,5,6,7,8,9,A,B,C,D...".
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.242 b/vim/vim-7.2/7.2.242
new file mode 100644
index 0000000..22341cd
--- /dev/null
+++ b/vim/vim-7.2/7.2.242
@@ -0,0 +1,89 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.242
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.242
+Problem:    Setting 'lazyredraw' causes the cursor column to be recomputed.
+	    (Tom Link)
+Solution:   Only recompute the cursor column for a boolean option if changes
+	    the cursor position.
+Files:	    src/option.c
+
+
+*** ../vim-7.2.241/src/option.c	2009-07-22 14:27:33.000000000 +0200
+--- src/option.c	2009-07-29 10:03:39.000000000 +0200
+***************
+*** 7194,7199 ****
+--- 7194,7207 ----
+  	compatible_set();
+      }
+  
++     /* 'list', 'number' */
++     else if ((int *)varp == &curwin->w_p_list
++ 	  || (int *)varp == &curwin->w_p_nu)
++     {
++ 	if (curwin->w_curswant != MAXCOL)
++ 	    curwin->w_set_curswant = TRUE;
++     }
++ 
+      else if ((int *)varp == &curbuf->b_p_ro)
+      {
+  	/* when 'readonly' is reset globally, also reset readonlymode */
+***************
+*** 7645,7650 ****
+--- 7653,7666 ----
+  	    curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
+  # endif
+  	}
++ 	if (curwin->w_curswant != MAXCOL)
++ 	    curwin->w_set_curswant = TRUE;
++     }
++ 
++     else if ((int *)varp == &p_arshape)
++     {
++ 	if (curwin->w_curswant != MAXCOL)
++ 	    curwin->w_set_curswant = TRUE;
+      }
+  #endif
+  
+***************
+*** 7655,7662 ****
+      options[opt_idx].flags |= P_WAS_SET;
+  
+      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
+!     if (curwin->w_curswant != MAXCOL)
+! 	curwin->w_set_curswant = TRUE;  /* in case 'list' changed */
+      check_redraw(options[opt_idx].flags);
+  
+      return NULL;
+--- 7671,7677 ----
+      options[opt_idx].flags |= P_WAS_SET;
+  
+      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
+! 
+      check_redraw(options[opt_idx].flags);
+  
+      return NULL;
+*** ../vim-7.2.241/src/version.c	2009-07-29 12:09:49.000000000 +0200
+--- src/version.c	2009-07-29 15:40:43.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     242,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+117. You are more comfortable typing in html.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.243 b/vim/vim-7.2/7.2.243
new file mode 100644
index 0000000..92a6580
--- /dev/null
+++ b/vim/vim-7.2/7.2.243
@@ -0,0 +1,67 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.243
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.243
+Problem:    Memory leak when using :vimgrep and resizing. (Dominique Pelle)
+Solution:   Free memory for aucmd_win when resizing and don't allocate it
+	    twice.
+Files:	    src/screen.c
+
+
+*** ../vim-7.2.242/src/screen.c	2009-06-16 17:22:38.000000000 +0200
+--- src/screen.c	2009-07-29 15:59:37.000000000 +0200
+***************
+*** 7467,7472 ****
+--- 7467,7476 ----
+       */
+      FOR_ALL_TAB_WINDOWS(tp, wp)
+  	win_free_lsize(wp);
++ #ifdef FEAT_AUTOCMD
++     if (aucmd_win != NULL)
++ 	win_free_lsize(aucmd_win);
++ #endif
+  
+      new_ScreenLines = (schar_T *)lalloc((long_u)(
+  			      (Rows + 1) * Columns * sizeof(schar_T)), FALSE);
+***************
+*** 7504,7510 ****
+  	}
+      }
+  #ifdef FEAT_AUTOCMD
+!     if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)
+  	outofmem = TRUE;
+  #endif
+  #ifdef FEAT_WINDOWS
+--- 7508,7515 ----
+  	}
+      }
+  #ifdef FEAT_AUTOCMD
+!     if (aucmd_win != NULL && aucmd_win->w_lines == NULL
+! 					&& win_alloc_lines(aucmd_win) == FAIL)
+  	outofmem = TRUE;
+  #endif
+  #ifdef FEAT_WINDOWS
+*** ../vim-7.2.242/src/version.c	2009-07-29 15:41:32.000000000 +0200
+--- src/version.c	2009-07-29 16:07:47.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     243,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+118. You are on a first-name basis with your ISP's staff.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.244 b/vim/vim-7.2/7.2.244
new file mode 100644
index 0000000..6c9b1fb
--- /dev/null
+++ b/vim/vim-7.2/7.2.244
@@ -0,0 +1,174 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.244
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.244
+Problem:    When 'enc' is utf-8 and 'fenc' is latin1, writing a non-latin1
+	    character gives a conversion error without any hint what is wrong.
+Solution:   When known add the line number to the error message.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.243/src/fileio.c	2009-07-29 12:09:49.000000000 +0200
+--- src/fileio.c	2009-07-29 17:04:06.000000000 +0200
+***************
+*** 121,126 ****
+--- 121,128 ----
+      char_u	*bw_conv_buf;	/* buffer for writing converted chars */
+      int		bw_conv_buflen; /* size of bw_conv_buf */
+      int		bw_conv_error;	/* set for conversion error */
++     linenr_T	bw_conv_error_lnum;  /* first line with error or zero */
++     linenr_T	bw_start_lnum;  /* line number at start of buffer */
+  # ifdef USE_ICONV
+      iconv_t	bw_iconv_fd;	/* descriptor for iconv() or -1 */
+  # endif
+***************
+*** 2924,2929 ****
+--- 2925,2931 ----
+      linenr_T	    lnum;
+      long	    nchars;
+      char_u	    *errmsg = NULL;
++     int		    errmsg_allocated = FALSE;
+      char_u	    *errnum = NULL;
+      char_u	    *buffer;
+      char_u	    smallbuf[SMBUFSIZE];
+***************
+*** 2987,2992 ****
+--- 2989,2995 ----
+      /* must init bw_conv_buf and bw_iconv_fd before jumping to "fail" */
+      write_info.bw_conv_buf = NULL;
+      write_info.bw_conv_error = FALSE;
++     write_info.bw_conv_error_lnum = 0;
+      write_info.bw_restlen = 0;
+  # ifdef USE_ICONV
+      write_info.bw_iconv_fd = (iconv_t)-1;
+***************
+*** 4243,4248 ****
+--- 4245,4251 ----
+  		nchars += write_info.bw_len;
+  	}
+      }
++     write_info.bw_start_lnum = start;
+  #endif
+  
+      write_info.bw_len = bufsize;
+***************
+*** 4278,4283 ****
+--- 4281,4289 ----
+  	    nchars += bufsize;
+  	    s = buffer;
+  	    len = 0;
++ #ifdef FEAT_MBYTE
++ 	    write_info.bw_start_lnum = lnum;
++ #endif
+  	}
+  	/* write failed or last line has no EOL: stop here */
+  	if (end == 0
+***************
+*** 4474,4480 ****
+  	{
+  #ifdef FEAT_MBYTE
+  	    if (write_info.bw_conv_error)
+! 		errmsg = (char_u *)_("E513: write error, conversion failed (make 'fenc' empty to override)");
+  	    else
+  #endif
+  		if (got_int)
+--- 4480,4496 ----
+  	{
+  #ifdef FEAT_MBYTE
+  	    if (write_info.bw_conv_error)
+! 	    {
+! 		if (write_info.bw_conv_error_lnum == 0)
+! 		    errmsg = (char_u *)_("E513: write error, conversion failed (make 'fenc' empty to override)");
+! 		else
+! 		{
+! 		    errmsg_allocated = TRUE;
+! 		    errmsg = alloc(300);
+! 		    vim_snprintf((char *)errmsg, 300, _("E513: write error, conversion failed in line %ld (make 'fenc' empty to override)"),
+! 					 (long)write_info.bw_conv_error_lnum);
+! 		}
+! 	    }
+  	    else
+  #endif
+  		if (got_int)
+***************
+*** 4550,4555 ****
+--- 4566,4577 ----
+  	{
+  	    STRCAT(IObuff, _(" CONVERSION ERROR"));
+  	    c = TRUE;
++ 	    if (write_info.bw_conv_error_lnum != 0)
++ 	    {
++ 		int l = STRLEN(IObuff);
++ 		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
++ 			(long)write_info.bw_conv_error_lnum);
++ 	    }
+  	}
+  	else if (notconverted)
+  	{
+***************
+*** 4746,4751 ****
+--- 4768,4775 ----
+  	}
+  	STRCAT(IObuff, errmsg);
+  	emsg(IObuff);
++ 	if (errmsg_allocated)
++ 	    vim_free(errmsg);
+  
+  	retval = FAIL;
+  	if (end == 0)
+***************
+*** 5105,5111 ****
+  			c = buf[wlen];
+  		}
+  
+! 		ip->bw_conv_error |= ucs2bytes(c, &p, flags);
+  	    }
+  	    if (flags & FIO_LATIN1)
+  		len = (int)(p - buf);
+--- 5129,5141 ----
+  			c = buf[wlen];
+  		}
+  
+! 		if (ucs2bytes(c, &p, flags) && !ip->bw_conv_error)
+! 		{
+! 		    ip->bw_conv_error = TRUE;
+! 		    ip->bw_conv_error_lnum = ip->bw_start_lnum;
+! 		}
+! 		if (c == NL)
+! 		    ++ip->bw_start_lnum;
+  	    }
+  	    if (flags & FIO_LATIN1)
+  		len = (int)(p - buf);
+***************
+*** 5386,5391 ****
+--- 5416,5422 ----
+  #ifdef FEAT_MBYTE
+  /*
+   * Convert a Unicode character to bytes.
++  * Return TRUE for an error, FALSE when it's OK.
+   */
+      static int
+  ucs2bytes(c, pp, flags)
+*** ../vim-7.2.243/src/version.c	2009-07-29 16:13:35.000000000 +0200
+--- src/version.c	2009-07-29 18:01:27.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     244,
+  /**/
+
+-- 
+Support your right to bare arms!  Wear short sleeves!
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.245 b/vim/vim-7.2/7.2.245
new file mode 100644
index 0000000..d046c97
--- /dev/null
+++ b/vim/vim-7.2/7.2.245
@@ -0,0 +1,165 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.245
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.245
+Problem:    When 'enc' is "utf-16" and 'fenc' is "utf-8" writing a file does
+	    conversion while none should be done. (Yukihiro Nakadaira) When
+	    'fenc' is empty the file is written as utf-8 instead of utf-16.
+Solution:   Do proper comparison of encodings, taking into account that all
+	    Unicode values for 'enc' use utf-8 internally.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.244/src/fileio.c	2009-07-29 18:05:57.000000000 +0200
+--- src/fileio.c	2009-07-29 17:04:06.000000000 +0200
+***************
+*** 134,140 ****
+  #ifdef FEAT_MBYTE
+  static linenr_T readfile_linenr __ARGS((linenr_T linecnt, char_u *p, char_u *endp));
+  static int ucs2bytes __ARGS((unsigned c, char_u **pp, int flags));
+! static int same_encoding __ARGS((char_u *a, char_u *b));
+  static int get_fio_flags __ARGS((char_u *ptr));
+  static char_u *check_for_bom __ARGS((char_u *p, long size, int *lenp, int flags));
+  static int make_bom __ARGS((char_u *buf, char_u *name));
+--- 134,140 ----
+  #ifdef FEAT_MBYTE
+  static linenr_T readfile_linenr __ARGS((linenr_T linecnt, char_u *p, char_u *endp));
+  static int ucs2bytes __ARGS((unsigned c, char_u **pp, int flags));
+! static int need_conversion __ARGS((char_u *fenc));
+  static int get_fio_flags __ARGS((char_u *ptr));
+  static char_u *check_for_bom __ARGS((char_u *p, long size, int *lenp, int flags));
+  static int make_bom __ARGS((char_u *buf, char_u *name));
+***************
+*** 1043,1055 ****
+      }
+  
+      /*
+!      * Conversion is required when the encoding of the file is different
+!      * from 'encoding' or 'encoding' is UTF-16, UCS-2 or UCS-4 (requires
+!      * conversion to UTF-8).
+       */
+      fio_flags = 0;
+!     converted = (*fenc != NUL && !same_encoding(p_enc, fenc));
+!     if (converted || enc_unicode != 0)
+      {
+  
+  	/* "ucs-bom" means we need to check the first bytes of the file
+--- 1043,1054 ----
+      }
+  
+      /*
+!      * Conversion may be required when the encoding of the file is different
+!      * from 'encoding' or 'encoding' is UTF-16, UCS-2 or UCS-4.
+       */
+      fio_flags = 0;
+!     converted = need_conversion(fenc);
+!     if (converted)
+      {
+  
+  	/* "ucs-bom" means we need to check the first bytes of the file
+***************
+*** 3969,3978 ****
+  	fenc = buf->b_p_fenc;
+  
+      /*
+!      * The file needs to be converted when 'fileencoding' is set and
+!      * 'fileencoding' differs from 'encoding'.
+       */
+!     converted = (*fenc != NUL && !same_encoding(p_enc, fenc));
+  
+      /*
+       * Check if UTF-8 to UCS-2/4 or Latin1 conversion needs to be done.  Or
+--- 3968,3976 ----
+  	fenc = buf->b_p_fenc;
+  
+      /*
+!      * Check if the file needs to be converted.
+       */
+!     converted = need_conversion(fenc);
+  
+      /*
+       * Check if UTF-8 to UCS-2/4 or Latin1 conversion needs to be done.  Or
+***************
+*** 5502,5521 ****
+  }
+  
+  /*
+!  * Return TRUE if "a" and "b" are the same 'encoding'.
+!  * Ignores difference between "ansi" and "latin1", "ucs-4" and "ucs-4be", etc.
+   */
+      static int
+! same_encoding(a, b)
+!     char_u	*a;
+!     char_u	*b;
+  {
+!     int		f;
+  
+!     if (STRCMP(a, b) == 0)
+! 	return TRUE;
+!     f = get_fio_flags(a);
+!     return (f != 0 && get_fio_flags(b) == f);
+  }
+  
+  /*
+--- 5500,5536 ----
+  }
+  
+  /*
+!  * Return TRUE if file encoding "fenc" requires conversion from or to
+!  * 'encoding'.
+   */
+      static int
+! need_conversion(fenc)
+!     char_u	*fenc;
+  {
+!     int		same_encoding;
+!     int		enc_flags;
+!     int		fenc_flags;
+  
+!     if (*fenc == NUL || STRCMP(p_enc, fenc) == 0)
+! 	same_encoding = TRUE;
+!     else
+!     {
+! 	/* Ignore difference between "ansi" and "latin1", "ucs-4" and
+! 	 * "ucs-4be", etc. */
+! 	enc_flags = get_fio_flags(p_enc);
+! 	fenc_flags = get_fio_flags(fenc);
+! 	same_encoding = (enc_flags != 0 && fenc_flags == enc_flags);
+!     }
+!     if (same_encoding)
+!     {
+! 	/* Specified encoding matches with 'encoding'.  This requires
+! 	 * conversion when 'encoding' is Unicode but not UTF-8. */
+! 	return enc_unicode != 0;
+!     }
+! 
+!     /* Encodings differ.  However, conversion is not needed when 'enc' is any
+!      * Unicode encoding and the file is UTF-8. */
+!     return !(enc_utf8 && fenc_flags == FIO_UTF8);
+  }
+  
+  /*
+*** ../vim-7.2.244/src/version.c	2009-07-29 18:05:57.000000000 +0200
+--- src/version.c	2009-07-29 18:20:08.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     245,
+  /**/
+
+-- 
+An actual excerpt from a classified section of a city newspaper:
+"Illiterate?  Write today for free help!"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.246 b/vim/vim-7.2/7.2.246
new file mode 100644
index 0000000..5b1c978
--- /dev/null
+++ b/vim/vim-7.2/7.2.246
@@ -0,0 +1,53 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.246
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.246
+Problem:    Cscope home page link is wrong.
+Solution:   Update the URL. (Sergey Khorev)
+Files:	    runtime/doc/if_cscop.txt
+
+
+*** ../vim-7.2.245/runtime/doc/if_cscop.txt	2009-07-09 21:22:36.000000000 +0200
+--- runtime/doc/if_cscop.txt	2009-09-11 11:19:31.000000000 +0200
+***************
+*** 481,487 ****
+  any problems, suggestions, patches, et al., you have for the usage of
+  cscope within Vim to him.
+  							*cscope-win32*
+! For a cscope version for Win32 see: http://iamphet.nm.ru/cscope/index.html
+  
+  Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>.  Contact
+  him if you have Win32-specific issues.
+--- 481,488 ----
+  any problems, suggestions, patches, et al., you have for the usage of
+  cscope within Vim to him.
+  							*cscope-win32*
+! For a cscope version for Win32 see:
+! 	http://code.google.com/p/cscope-win32/
+  
+  Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>.  Contact
+  him if you have Win32-specific issues.
+*** ../vim-7.2.245/src/version.c	2009-07-29 18:24:59.000000000 +0200
+--- src/version.c	2009-09-11 11:29:02.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     246,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+221. Your wife melts your keyboard in the oven.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.247 b/vim/vim-7.2/7.2.247
new file mode 100644
index 0000000..e18926d
--- /dev/null
+++ b/vim/vim-7.2/7.2.247
@@ -0,0 +1,86 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.247
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.247
+Problem:    Mzscheme interface minor problem.
+Solution:   Better error message when build fails. (Sergey Khorev)
+Files:	    src/if_mzsch.c
+
+
+*** ../vim-7.2.246/src/if_mzsch.c	2009-07-09 20:06:30.000000000 +0200
+--- src/if_mzsch.c	2009-09-11 11:20:39.000000000 +0200
+***************
+*** 635,642 ****
+  #endif /* DYNAMIC_MZSCHEME */
+  
+  /* need to put it here for dynamic stuff to work */
+! #ifdef INCLUDE_MZSCHEME_BASE
+  # include "mzscheme_base.c"
+  #endif
+  
+  /*
+--- 635,644 ----
+  #endif /* DYNAMIC_MZSCHEME */
+  
+  /* need to put it here for dynamic stuff to work */
+! #if defined(INCLUDE_MZSCHEME_BASE)
+  # include "mzscheme_base.c"
++ #elif MZSCHEME_VERSION_MAJOR >= 400
++ # error MzScheme 4.x must include mzscheme_base.c, for MinGW32 you need to define MZSCHEME_GENERATE_BASE=yes
+  #endif
+  
+  /*
+***************
+*** 875,888 ****
+  #ifdef INCLUDE_MZSCHEME_BASE
+      {
+  	/*
+! 	 * versions 4.x do not provide Scheme bindings by defaults
+  	 * we need to add them explicitly
+  	 */
+  	Scheme_Object *scheme_base_symbol = NULL;
+  	MZ_GC_DECL_REG(1);
+  	MZ_GC_VAR_IN_REG(0, scheme_base_symbol);
+  	MZ_GC_REG();
+! 	/* invoke function from generated and included base.c */
+  	declare_modules(environment);
+  	scheme_base_symbol = scheme_intern_symbol("scheme/base");
+  	MZ_GC_CHECK();
+--- 877,890 ----
+  #ifdef INCLUDE_MZSCHEME_BASE
+      {
+  	/*
+! 	 * versions 4.x do not provide Scheme bindings by default
+  	 * we need to add them explicitly
+  	 */
+  	Scheme_Object *scheme_base_symbol = NULL;
+  	MZ_GC_DECL_REG(1);
+  	MZ_GC_VAR_IN_REG(0, scheme_base_symbol);
+  	MZ_GC_REG();
+! 	/* invoke function from generated and included mzscheme_base.c */
+  	declare_modules(environment);
+  	scheme_base_symbol = scheme_intern_symbol("scheme/base");
+  	MZ_GC_CHECK();
+*** ../vim-7.2.246/src/version.c	2009-09-11 11:30:12.000000000 +0200
+--- src/version.c	2009-09-11 11:53:59.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     247,
+  /**/
+
+-- 
+Your fault: core dumped
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.248 b/vim/vim-7.2/7.2.248
new file mode 100644
index 0000000..2254101
--- /dev/null
+++ b/vim/vim-7.2/7.2.248
@@ -0,0 +1,158 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.248 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.248 (extra)
+Problem:    Mzscheme interface building minor problems.
+Solution:   Update Win32 makefiles. (Sergey Khorev)
+Files:	    src/Make_cyg.mak, src/Make_ming.mak, src/Make_mvc.mak
+
+
+*** ../vim-7.2.247/src/Make_cyg.mak	2007-09-30 22:28:48.000000000 +0200
+--- src/Make_cyg.mak	2009-09-11 11:23:23.000000000 +0200
+***************
+*** 212,224 ****
+  MZSCHEME_VER = 209_000
+  endif
+  
+  ifeq (yes, $(DYNAMIC_MZSCHEME))
+  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+  else
+  ifndef MZSCHEME_DLLS
+  MZSCHEME_DLLS = $(MZSCHEME)
+  endif
+! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+  endif
+  endif
+  
+--- 212,245 ----
+  MZSCHEME_VER = 209_000
+  endif
+  
++ ifndef MZSCHEME_PRECISE_GC
++ MZSCHEME_PRECISE_GC=no
++ endif
++ 
++ # for version 4.x we need to generate byte-code for Scheme base
++ ifndef MZSCHEME_GENERATE_BASE
++ MZSCHEME_GENERATE_BASE=no
++ endif
++ 
+  ifeq (yes, $(DYNAMIC_MZSCHEME))
+  DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+  else
+  ifndef MZSCHEME_DLLS
+  MZSCHEME_DLLS = $(MZSCHEME)
+  endif
+! ifeq (yes,$(MZSCHEME_PRECISE_GC))
+! MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
+! else
+! MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+! endif
+! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
+! endif
+! ifeq (yes,$(MZSCHEME_GENERATE_BASE))
+! DEFINES += -DINCLUDE_MZSCHEME_BASE
+! MZ_EXTRA_DEP += mzscheme_base.c
+! endif
+! ifeq (yes,$(MZSCHEME_PRECISE_GC))
+! DEFINES += -DMZ_PRECISE_GC
+  endif
+  endif
+  
+***************
+*** 473,478 ****
+--- 494,502 ----
+  ifdef PERL
+  	-$(DEL) if_perl.c
+  endif
++ ifdef MZSCHEME
++ 	-$(DEL) mzscheme_base.c
++ endif
+  	-$(DEL) pathdef.c
+  	$(MAKE) -C xxd -f Make_cyg.mak clean
+  	$(MAKE) -C GvimExt -f Make_ming.mak clean
+***************
+*** 523,531 ****
+--- 547,561 ----
+  $(OUTDIR)/netbeans.o:	netbeans.c $(INCL) $(NBDEBUG_DEP)
+  	$(CC) -c $(CFLAGS) netbeans.c -o $(OUTDIR)/netbeans.o
+  
++ $(OUTDIR)/if_mzsch.o:	if_mzsch.c $(INCL) if_mzsch.h $(MZ_EXTRA_DEP)
++ 	$(CC) -c $(CFLAGS) if_mzsch.c -o $(OUTDIR)/if_mzsch.o
++ 
+  $(OUTDIR)/vimrc.o:	vim.rc version.h gui_w32_rc.h
+  	$(RC) $(RCFLAGS) vim.rc -o $(OUTDIR)/vimrc.o
+  
++ mzscheme_base.c:
++ 	$(MZSCHEME)/mzc --c-mods mzscheme_base.c ++lib scheme/base
++ 
+  pathdef.c: $(INCL)
+  ifneq (sh.exe, $(SHELL))
+  	@echo creating pathdef.c
+*** ../vim-7.2.247/src/Make_ming.mak	2009-05-26 22:58:43.000000000 +0200
+--- src/Make_ming.mak	2009-09-11 11:23:28.000000000 +0200
+***************
+*** 135,141 ****
+  ifndef MZSCHEME_DLLS
+  MZSCHEME_DLLS=$(MZSCHEME)
+  endif
+! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS)
+  endif
+  
+  endif
+--- 135,141 ----
+  ifndef MZSCHEME_DLLS
+  MZSCHEME_DLLS=$(MZSCHEME)
+  endif
+! MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib
+  endif
+  
+  endif
+***************
+*** 563,568 ****
+--- 563,571 ----
+  ifdef PERL
+  	-$(DEL) if_perl.c
+  endif
++ ifdef MZSCHEME
++ 	-$(DEL) mzscheme_base.c
++ endif
+  	$(MAKE) -C GvimExt -f Make_ming.mak clean
+  	$(MAKE) -C xxd -f Make_cyg.mak clean
+  
+*** ../vim-7.2.247/src/Make_mvc.mak	2009-06-16 16:45:14.000000000 +0200
+--- src/Make_mvc.mak	2009-09-11 11:23:28.000000000 +0200
+***************
+*** 865,870 ****
+--- 865,871 ----
+  	- if exist dimm_i.c del dimm_i.c
+  	- if exist dimm.tlb del dimm.tlb
+  	- if exist dosinst.exe del dosinst.exe
++ 	- if exist mzscheme_base.c del mzscheme_base.c
+  	cd xxd
+  	$(MAKE) /NOLOGO -f Make_mvc.mak clean
+  	cd ..
+*** ../vim-7.2.247/src/version.c	2009-09-11 12:20:47.000000000 +0200
+--- src/version.c	2009-09-11 12:48:26.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     248,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+222. You send more than 20 personal e-mails a day.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.249 b/vim/vim-7.2/7.2.249
new file mode 100644
index 0000000..33169f7
--- /dev/null
+++ b/vim/vim-7.2/7.2.249
@@ -0,0 +1,47 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.249
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.249
+Problem:    The script to check .po files can't handle '%' in plural forms.
+Solution:   Remove "Plural-Forms:" from the checked string.
+Files:	    src/po/check.vim
+
+
+*** ../vim-7.2.248/src/po/check.vim	2008-06-09 14:45:38.000000000 +0200
+--- src/po/check.vim	2009-09-11 12:37:56.000000000 +0200
+***************
+*** 23,28 ****
+--- 23,31 ----
+    " remove '%', not used for formatting.
+    let idline = substitute(idline, "'%'", '', 'g')
+  
++   " remove '%' used for plural forms.
++   let idline = substitute(idline, '\\nPlural-Forms: .\+;\\n', '', '')
++ 
+    " remove everything but % items.
+    return substitute(idline, '[^%]*\(%[-+ #''.0-9*]*l\=[dsuxXpoc%]\)\=', '\1', 'g')
+  endfunc
+*** ../vim-7.2.248/src/version.c	2009-09-11 12:48:56.000000000 +0200
+--- src/version.c	2009-09-11 12:59:18.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     249,
+  /**/
+
+-- 
+If evolution theories are correct, humans will soon grow a third
+hand for operating the mouse.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.250 b/vim/vim-7.2/7.2.250
new file mode 100644
index 0000000..2f30a24
--- /dev/null
+++ b/vim/vim-7.2/7.2.250
@@ -0,0 +1,55 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.250 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.250 (extra)
+Problem:    Possible buffer overflow.
+Solution:   Compute the remaining space. (Dominique Pelle)
+Files:	    src/GvimExt/gvimext.cpp
+
+
+*** ../vim-7.2.249/src/GvimExt/gvimext.cpp	2008-07-24 20:51:11.000000000 +0200
+--- src/GvimExt/gvimext.cpp	2009-09-11 13:26:27.000000000 +0200
+***************
+*** 635,641 ****
+  	}
+  	// Now concatenate
+  	strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
+! 	strncat(temp, title, BUFSIZE - 1);
+  	InsertMenu(hMenu,
+  		indexMenu++,
+  		MF_STRING|MF_BYPOSITION,
+--- 635,643 ----
+  	}
+  	// Now concatenate
+  	strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
+! 	temp[BUFSIZE - 1] = '\0';
+! 	strncat(temp, title, BUFSIZE - 1 - strlen(temp));
+! 	temp[BUFSIZE - 1] = '\0';
+  	InsertMenu(hMenu,
+  		indexMenu++,
+  		MF_STRING|MF_BYPOSITION,
+*** ../vim-7.2.249/src/version.c	2009-09-11 12:59:57.000000000 +0200
+--- src/version.c	2009-09-11 13:23:45.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     250,
+  /**/
+
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+223. You set up a web-cam as your home's security system.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.251 b/vim/vim-7.2/7.2.251
new file mode 100644
index 0000000..00cf0f0
--- /dev/null
+++ b/vim/vim-7.2/7.2.251
@@ -0,0 +1,71 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.251
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.251 (after 7.2.044)
+Problem:    Compiler adds invalid memory bounds check.
+Solution:   Remove _FORTIFY_SOURCE=2 from CFLAGS. (Dominique Pelle)
+Files:	    src/auto/configure, src/configure.in
+
+
+*** ../vim-7.2.250/src/auto/configure	2009-07-22 11:16:54.000000000 +0200
+--- src/auto/configure	2009-08-07 14:49:52.000000000 +0200
+***************
+*** 17135,17141 ****
+        { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
+  $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
+    if test "$gccmajor" -gt "3"; then
+!     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+  $as_echo "yes" >&6; }
+    else
+--- 17135,17141 ----
+        { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
+  $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
+    if test "$gccmajor" -gt "3"; then
+!     CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+  $as_echo "yes" >&6; }
+    else
+*** ../vim-7.2.250/src/configure.in	2009-07-22 11:16:54.000000000 +0200
+--- src/configure.in	2009-08-07 14:49:47.000000000 +0200
+***************
+*** 3233,3239 ****
+    dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
+    AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
+    if test "$gccmajor" -gt "3"; then
+!     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+--- 3233,3239 ----
+    dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
+    AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
+    if test "$gccmajor" -gt "3"; then
+!     CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+*** ../vim-7.2.250/src/version.c	2009-09-11 13:26:38.000000000 +0200
+--- src/version.c	2009-09-11 13:43:46.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     251,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+225. You sign up for free subscriptions for all the computer magazines
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.252 b/vim/vim-7.2/7.2.252
new file mode 100644
index 0000000..b7dc702
--- /dev/null
+++ b/vim/vim-7.2/7.2.252
@@ -0,0 +1,51 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.252
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.252
+Problem:    When using a multi-byte 'enc' the 'iskeyword' option cannot
+	    contain characters above 128.
+Solution:   Use mb_ptr2char_adv().
+Files:	    src/charset.c
+
+
+*** ../vim-7.2.251/src/charset.c	2009-05-14 22:19:19.000000000 +0200
+--- src/charset.c	2009-09-09 21:11:46.000000000 +0200
+***************
+*** 174,179 ****
+--- 174,184 ----
+  	    if (VIM_ISDIGIT(*p))
+  		c = getdigits(&p);
+  	    else
++ #ifdef FEAT_MBYTE
++ 		 if (has_mbyte)
++ 		c = mb_ptr2char_adv(&p);
++ 	    else
++ #endif
+  		c = *p++;
+  	    c2 = -1;
+  	    if (*p == '-' && p[1] != NUL)
+*** ../vim-7.2.251/src/version.c	2009-09-11 13:44:33.000000000 +0200
+--- src/version.c	2009-09-11 14:01:48.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     252,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+226. You sit down at the computer right after dinner and your spouse
+     says "See you in the morning."
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.253 b/vim/vim-7.2/7.2.253
new file mode 100644
index 0000000..354d444
--- /dev/null
+++ b/vim/vim-7.2/7.2.253
@@ -0,0 +1,143 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.253
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.253
+Problem:    Netbeans interface: getLength always uses current buffer.
+Solution:   Use ml_get_buf() instead of ml_get(). (Xavier de Gaye)
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.2.252/src/netbeans.c	2009-06-24 16:49:50.000000000 +0200
+--- src/netbeans.c	2009-09-11 13:40:14.000000000 +0200
+***************
+*** 1499,1505 ****
+  		    return FAIL;
+  		}
+  		first = *pos;
+! 		nbdebug(("    FIRST POS: line %d, col %d\n", first.lnum, first.col));
+  		pos = off2pos(buf->bufp, off+count-1);
+  		if (!pos)
+  		{
+--- 1499,1506 ----
+  		    return FAIL;
+  		}
+  		first = *pos;
+! 		nbdebug(("    FIRST POS: line %d, col %d\n",
+! 						      first.lnum, first.col));
+  		pos = off2pos(buf->bufp, off+count-1);
+  		if (!pos)
+  		{
+***************
+*** 1510,1516 ****
+  		    return FAIL;
+  		}
+  		last = *pos;
+! 		nbdebug(("    LAST POS: line %d, col %d\n", last.lnum, last.col));
+  		del_from_lnum = first.lnum;
+  		del_to_lnum = last.lnum;
+  		doupdate = 1;
+--- 1511,1518 ----
+  		    return FAIL;
+  		}
+  		last = *pos;
+! 		nbdebug(("    LAST POS: line %d, col %d\n",
+! 							last.lnum, last.col));
+  		del_from_lnum = first.lnum;
+  		del_to_lnum = last.lnum;
+  		doupdate = 1;
+***************
+*** 1521,1527 ****
+  		next = off2pos(buf->bufp, off + count);
+  
+  		/* Remove part of the first line. */
+! 		if (first.col != 0 || (next != NULL && first.lnum == next->lnum))
+  		{
+  		    if (first.lnum != last.lnum
+  			    || (next != NULL && first.lnum != next->lnum))
+--- 1523,1530 ----
+  		next = off2pos(buf->bufp, off + count);
+  
+  		/* Remove part of the first line. */
+! 		if (first.col != 0
+! 				|| (next != NULL && first.lnum == next->lnum))
+  		{
+  		    if (first.lnum != last.lnum
+  			    || (next != NULL && first.lnum != next->lnum))
+***************
+*** 1584,1590 ****
+  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
+  			if (id > 0)
+  			{
+! 			    nbdebug(("    Deleting sign %d on line %d\n", id, i));
+  			    buf_delsign(buf->bufp, id);
+  			}
+  			else
+--- 1587,1594 ----
+  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
+  			if (id > 0)
+  			{
+! 			    nbdebug(("    Deleting sign %d on line %d\n",
+! 								      id, i));
+  			    buf_delsign(buf->bufp, id);
+  			}
+  			else
+***************
+*** 1593,1599 ****
+  			}
+  		    }
+  
+! 		    nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
+  		    curwin->w_cursor.lnum = del_from_lnum;
+  		    curwin->w_cursor.col = 0;
+  		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
+--- 1597,1604 ----
+  			}
+  		    }
+  
+! 		    nbdebug(("    Deleting lines %d through %d\n",
+! 						 del_from_lnum, del_to_lnum));
+  		    curwin->w_cursor.lnum = del_from_lnum;
+  		    curwin->w_cursor.col = 0;
+  		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
+***************
+*** 3514,3520 ****
+  	    eol_size = 1;
+  	for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
+  	{
+! 	    char_count += (long)STRLEN(ml_get(lnum)) + eol_size;
+  	    /* Check for a CTRL-C every 100000 characters */
+  	    if (char_count > last_check)
+  	    {
+--- 3519,3526 ----
+  	    eol_size = 1;
+  	for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
+  	{
+! 	    char_count += (long)STRLEN(ml_get_buf(bufp, lnum, FALSE))
+! 								   + eol_size;
+  	    /* Check for a CTRL-C every 100000 characters */
+  	    if (char_count > last_check)
+  	    {
+*** ../vim-7.2.252/src/version.c	2009-09-11 14:02:25.000000000 +0200
+--- src/version.c	2009-09-11 14:18:45.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     253,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+227. You sleep next to your monitor.  Or on top of it.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.254 b/vim/vim-7.2/7.2.254
new file mode 100644
index 0000000..c8c57af
--- /dev/null
+++ b/vim/vim-7.2/7.2.254
@@ -0,0 +1,52 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.254
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.254
+Problem:    Compiler warning for assigning size_t to int.
+Solution:   Use size_t for the variable. (George Reilly)
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.253/src/fileio.c	2009-07-29 18:24:59.000000000 +0200
+--- src/fileio.c	2009-09-11 13:46:19.000000000 +0200
+***************
+*** 4568,4574 ****
+  	    c = TRUE;
+  	    if (write_info.bw_conv_error_lnum != 0)
+  	    {
+! 		int l = STRLEN(IObuff);
+  		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
+  			(long)write_info.bw_conv_error_lnum);
+  	    }
+--- 4568,4574 ----
+  	    c = TRUE;
+  	    if (write_info.bw_conv_error_lnum != 0)
+  	    {
+! 		size_t l = STRLEN(IObuff);
+  		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
+  			(long)write_info.bw_conv_error_lnum);
+  	    }
+*** ../vim-7.2.253/src/version.c	2009-09-11 14:19:41.000000000 +0200
+--- src/version.c	2009-09-11 15:03:42.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     254,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+230. You spend your Friday nights typing away at your keyboard
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.255 b/vim/vim-7.2/7.2.255
new file mode 100644
index 0000000..1bb85b1
--- /dev/null
+++ b/vim/vim-7.2/7.2.255
@@ -0,0 +1,71 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.255
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.255 (after 7.2.242)
+Problem:    Setting 'rightleft', 'linebreak' and 'wrap' may cause cursor to be
+	    in wrong place.
+Solution:   Recompute the cursor column for these options.
+Files:	    src/option.c
+
+
+*** ../vim-7.2.254/src/option.c	2009-07-29 15:41:32.000000000 +0200
+--- src/option.c	2009-09-11 13:59:55.000000000 +0200
+***************
+*** 7430,7435 ****
+--- 7430,7437 ----
+      {
+  	if (curwin->w_p_wrap)
+  	    curwin->w_leftcol = 0;
++ 	if (curwin->w_curswant != MAXCOL)
++ 	    curwin->w_set_curswant = TRUE;
+      }
+  
+  #ifdef FEAT_WINDOWS
+***************
+*** 7664,7669 ****
+--- 7666,7687 ----
+      }
+  #endif
+  
++ #ifdef FEAT_LINEBREAK
++     if ((int *)varp == &curwin->w_p_lbr)
++     {
++ 	if (curwin->w_curswant != MAXCOL)
++ 	    curwin->w_set_curswant = TRUE;
++     }
++ #endif
++ 
++ #ifdef FEAT_RIGHTLEFT
++     if ((int *)varp == &curwin->w_p_rl)
++     {
++ 	if (curwin->w_curswant != MAXCOL)
++ 	    curwin->w_set_curswant = TRUE;
++     }
++ #endif
++ 
+      /*
+       * End of handling side effects for bool options.
+       */
+*** ../vim-7.2.254/src/version.c	2009-09-11 15:04:13.000000000 +0200
+--- src/version.c	2009-09-11 15:19:40.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     255,
+  /**/
+
+-- 
+A computer without Windows is like a fish without a bicycle.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.256 b/vim/vim-7.2/7.2.256
new file mode 100644
index 0000000..17361fb
--- /dev/null
+++ b/vim/vim-7.2/7.2.256
@@ -0,0 +1,59 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.256
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.256
+Problem:    When 'guifont' was not set GTK font dialog doesn't have a default.
+	    (Andreas Metzler)
+Solution:   Set default to DEFAULT_FONT. (James Vega)
+Files:	    src/gui_gtk_x11.c
+
+
+*** ../vim-7.2.255/src/gui_gtk_x11.c	2009-07-01 18:04:30.000000000 +0200
+--- src/gui_gtk_x11.c	2009-09-11 14:21:32.000000000 +0200
+***************
+*** 4729,4734 ****
+--- 4729,4737 ----
+      if (oldval != NULL && *oldval != NUL)
+  	gtk_font_selection_dialog_set_font_name(
+  		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), (char *)oldval);
++     else
++ 	gtk_font_selection_dialog_set_font_name(
++ 		GTK_FONT_SELECTION_DIALOG(gui.fontdlg), DEFAULT_FONT);
+  
+      if (gui.fontname)
+      {
+***************
+*** 4816,4821 ****
+--- 4819,4827 ----
+  	if (oldname != oldval)
+  	    vim_free(oldname);
+      }
++     else
++ 	gtk_font_selection_dialog_set_font_name(
++ 		GTK_FONT_SELECTION_DIALOG(dialog), DEFAULT_FONT);
+  
+      response = gtk_dialog_run(GTK_DIALOG(dialog));
+  
+*** ../vim-7.2.255/src/version.c	2009-09-11 15:20:22.000000000 +0200
+--- src/version.c	2009-09-11 15:45:36.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     256,
+  /**/
+
+-- 
+Get a life?  What is the URL where it can be downloaded?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.257 b/vim/vim-7.2/7.2.257
new file mode 100644
index 0000000..a856a3a
--- /dev/null
+++ b/vim/vim-7.2/7.2.257
@@ -0,0 +1,61 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.257
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.257
+Problem:    With GTK 2.17 lots of assertion error messages.
+Solution:   Remove check for static gravity. (Sebastian Droege)
+Files:	    src/gui_gtk_f.c
+
+
+*** ../vim-7.2.256/src/gui_gtk_f.c	2009-05-17 23:25:16.000000000 +0200
+--- src/gui_gtk_f.c	2009-09-11 15:15:41.000000000 +0200
+***************
+*** 860,870 ****
+  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
+  {
+  #ifdef HAVE_GTK2
+!     gboolean static_gravity_supported;
+! 
+!     static_gravity_supported = gdk_window_set_static_gravities(window,
+! 							       use_static);
+!     g_return_if_fail(static_gravity_supported);
+  #else
+      XSetWindowAttributes xattributes;
+  
+--- 860,868 ----
+  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
+  {
+  #ifdef HAVE_GTK2
+!     /* We don't check if static gravity is actually supported, because it
+!      * results in an annoying assertion error message. */
+!     gdk_window_set_static_gravities(window, use_static);
+  #else
+      XSetWindowAttributes xattributes;
+  
+*** ../vim-7.2.256/src/version.c	2009-09-11 15:46:20.000000000 +0200
+--- src/version.c	2009-09-11 16:16:52.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     257,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner
+     in the front doorway permanently so it always looks like you are
+     actually attempting to do something about that mess that has amassed
+     since you discovered the Internet.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.258 b/vim/vim-7.2/7.2.258
new file mode 100644
index 0000000..98ddab5
--- /dev/null
+++ b/vim/vim-7.2/7.2.258
@@ -0,0 +1,74 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.258
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.258
+Problem:    v:beval_col and b:beval_text are wrong in UTF-8 text. (Tony
+	    Mechelynck)
+Solution:   Use byte number instead of character number for the column.
+Files:	    src/ui.c
+
+
+*** ../vim-7.2.257/src/ui.c	2009-07-01 18:04:30.000000000 +0200
+--- src/ui.c	2009-09-11 16:11:50.000000000 +0200
+***************
+*** 3055,3072 ****
+      int		vcol;
+  {
+      /* try to advance to the specified column */
+-     int		col = 0;
+      int		count = 0;
+      char_u	*ptr;
+  
+!     ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
+      while (count <= vcol && *ptr != NUL)
+      {
+- 	++col;
+  	count += win_lbr_chartabsize(wp, ptr, count, NULL);
+  	mb_ptr_adv(ptr);
+      }
+!     return col;
+  }
+  #endif
+  
+--- 3055,3071 ----
+      int		vcol;
+  {
+      /* try to advance to the specified column */
+      int		count = 0;
+      char_u	*ptr;
++     char_u	*start;
+  
+!     start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
+      while (count <= vcol && *ptr != NUL)
+      {
+  	count += win_lbr_chartabsize(wp, ptr, count, NULL);
+  	mb_ptr_adv(ptr);
+      }
+!     return (int)(ptr - start);
+  }
+  #endif
+  
+*** ../vim-7.2.257/src/version.c	2009-09-11 16:17:36.000000000 +0200
+--- src/version.c	2009-09-11 16:45:48.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     258,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+232. You start conversations with, "Have you gotten an ISDN line?"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.259 b/vim/vim-7.2/7.2.259
new file mode 100644
index 0000000..0bf0ba1
--- /dev/null
+++ b/vim/vim-7.2/7.2.259
@@ -0,0 +1,160 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.259
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.259
+Problem:    exists() doesn't work properly for an empty aucmd group.
+Solution:   Change how au_exists() handles a missing pattern.  Also add a
+	    test for this. (Bob Hiestand)
+Files:	    src/fileio.c, src/testdir/Makefile, src/testdir/test67.in,
+	    src/testdir/test67.ok
+
+
+*** ../vim-7.2.258/src/fileio.c	2009-09-11 15:04:13.000000000 +0200
+--- src/fileio.c	2009-09-11 16:37:08.000000000 +0200
+***************
+*** 9498,9512 ****
+      ap = first_autopat[(int)event];
+      if (ap == NULL)
+  	goto theend;
+-     if (pattern == NULL)
+-     {
+- 	retval = TRUE;
+- 	goto theend;
+-     }
+  
+      /* if pattern is "<buffer>", special handling is needed which uses curbuf */
+      /* for pattern "<buffer=N>, fnamecmp() will work fine */
+!     if (STRICMP(pattern, "<buffer>") == 0)
+  	buflocal_buf = curbuf;
+  
+      /* Check if there is an autocommand with the given pattern. */
+--- 9498,9507 ----
+      ap = first_autopat[(int)event];
+      if (ap == NULL)
+  	goto theend;
+  
+      /* if pattern is "<buffer>", special handling is needed which uses curbuf */
+      /* for pattern "<buffer=N>, fnamecmp() will work fine */
+!     if (pattern != NULL && STRICMP(pattern, "<buffer>") == 0)
+  	buflocal_buf = curbuf;
+  
+      /* Check if there is an autocommand with the given pattern. */
+***************
+*** 9515,9523 ****
+  	/* For buffer-local autocommands, fnamecmp() works fine. */
+  	if (ap->pat != NULL && ap->cmds != NULL
+  	    && (group == AUGROUP_ALL || ap->group == group)
+! 	    && (buflocal_buf == NULL
+! 		 ? fnamecmp(ap->pat, pattern) == 0
+! 		 : ap->buflocal_nr == buflocal_buf->b_fnum))
+  	{
+  	    retval = TRUE;
+  	    break;
+--- 9510,9519 ----
+  	/* For buffer-local autocommands, fnamecmp() works fine. */
+  	if (ap->pat != NULL && ap->cmds != NULL
+  	    && (group == AUGROUP_ALL || ap->group == group)
+! 	    && (pattern == NULL
+! 		|| (buflocal_buf == NULL
+! 		    ? fnamecmp(ap->pat, pattern) == 0
+! 		    : ap->buflocal_nr == buflocal_buf->b_fnum)))
+  	{
+  	    retval = TRUE;
+  	    break;
+*** ../vim-7.2.258/src/testdir/Makefile	2009-06-24 18:07:55.000000000 +0200
+--- src/testdir/Makefile	2009-09-11 16:31:33.000000000 +0200
+***************
+*** 22,28 ****
+  		test48.out test49.out test51.out test52.out test53.out \
+  		test54.out test55.out test56.out test57.out test58.out \
+  		test59.out test60.out test61.out test62.out test63.out \
+! 		test64.out test65.out test66.out
+  
+  SCRIPTS_GUI = test16.out
+  
+--- 22,28 ----
+  		test48.out test49.out test51.out test52.out test53.out \
+  		test54.out test55.out test56.out test57.out test58.out \
+  		test59.out test60.out test61.out test62.out test63.out \
+! 		test64.out test65.out test66.out test67.out
+  
+  SCRIPTS_GUI = test16.out
+  
+*** ../vim-7.2.258/src/testdir/test67.in	2009-09-11 17:23:47.000000000 +0200
+--- src/testdir/test67.in	2009-09-11 16:43:11.000000000 +0200
+***************
+*** 0 ****
+--- 1,33 ----
++ Test that groups and patterns are tested correctly when calling exists() for
++ autocommands.
++ 
++ STARTTEST
++ :so small.vim
++ :let results=[]
++ :augroup auexists
++ :augroup END
++ :call add(results, "##BufEnter: " . exists("##BufEnter"))
++ :call add(results, "#BufEnter: " . exists("#BufEnter"))
++ :au BufEnter * let g:entered=1
++ :call add(results, "#BufEnter: " . exists("#BufEnter"))
++ :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter"))
++ :augroup auexists
++ :au BufEnter * let g:entered=1
++ :augroup END
++ :call add(results, "#auexists#BufEnter: " . exists("#auexists#BufEnter"))
++ :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test"))
++ :au BufEnter *.test let g:entered=1
++ :call add(results, "#BufEnter#*.test: " . exists("#BufEnter#*.test"))
++ :edit testfile.test
++ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
++ :au BufEnter <buffer> let g:entered=1
++ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
++ :edit testfile2.test
++ :call add(results, "#BufEnter#<buffer>: " . exists("#BufEnter#<buffer>"))
++ :e test.out
++ :call append(0, results)
++ :$d
++ :w
++ :qa!
++ ENDTEST
++ 
+*** ../vim-7.2.258/src/testdir/test67.ok	2009-09-11 17:23:47.000000000 +0200
+--- src/testdir/test67.ok	2009-09-11 16:43:15.000000000 +0200
+***************
+*** 0 ****
+--- 1,10 ----
++ ##BufEnter: 1
++ #BufEnter: 0
++ #BufEnter: 1
++ #auexists#BufEnter: 0
++ #auexists#BufEnter: 1
++ #BufEnter#*.test: 0
++ #BufEnter#*.test: 1
++ #BufEnter#<buffer>: 0
++ #BufEnter#<buffer>: 1
++ #BufEnter#<buffer>: 0
+*** ../vim-7.2.258/src/version.c	2009-09-11 16:48:06.000000000 +0200
+--- src/version.c	2009-09-11 17:23:14.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     259,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+234. You started college as a chemistry major, and walk out four years
+     later as an Internet provider.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.260 b/vim/vim-7.2/7.2.260
new file mode 100644
index 0000000..46d4365
--- /dev/null
+++ b/vim/vim-7.2/7.2.260
@@ -0,0 +1,155 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.260 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.260 (extra part of 7.2.259)
+Problem:    exists() doesn't work properly for empty aucmd group.
+Solution:   Change how au_exists() handles a missing pattern.  Also add a
+	    test for this. (Bob Hiestand)
+Files:	    src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
+	    src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
+	    src/testdir/Make_vms.mms
+
+
+*** ../vim-7.2.259/src/testdir/Make_amiga.mak	2009-03-11 16:36:04.000000000 +0100
+--- src/testdir/Make_amiga.mak	2009-09-11 16:29:54.000000000 +0200
+***************
+*** 26,32 ****
+  		test48.out test51.out test53.out test54.out test55.out \
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+! 		test66.out
+  
+  .SUFFIXES: .in .out
+  
+--- 26,32 ----
+  		test48.out test51.out test53.out test54.out test55.out \
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+! 		test66.out test67.out
+  
+  .SUFFIXES: .in .out
+  
+***************
+*** 112,114 ****
+--- 112,115 ----
+  test64.out: test64.in
+  test65.out: test65.in
+  test66.out: test66.in
++ test67.out: test67.in
+*** ../vim-7.2.259/src/testdir/Make_dos.mak	2009-03-11 16:36:04.000000000 +0100
+--- src/testdir/Make_dos.mak	2009-09-11 16:30:17.000000000 +0200
+***************
+*** 26,32 ****
+  		test15.out test17.out test18.out test21.out test26.out \
+  		test30.out test31.out test32.out test33.out test34.out \
+  		test37.out test38.out test39.out test40.out test41.out \
+! 		test42.out test52.out test65.out test66.out
+  
+  SCRIPTS32 =	test50.out
+  
+--- 26,32 ----
+  		test15.out test17.out test18.out test21.out test26.out \
+  		test30.out test31.out test32.out test33.out test34.out \
+  		test37.out test38.out test39.out test40.out test41.out \
+! 		test42.out test52.out test65.out test66.out test67.out
+  
+  SCRIPTS32 =	test50.out
+  
+*** ../vim-7.2.259/src/testdir/Make_ming.mak	2009-03-11 16:36:04.000000000 +0100
+--- src/testdir/Make_ming.mak	2009-09-11 16:30:37.000000000 +0200
+***************
+*** 45,51 ****
+  		test15.out test17.out test18.out test21.out test26.out \
+  		test30.out test31.out test32.out test33.out test34.out \
+  		test37.out test38.out test39.out test40.out test41.out \
+! 		test42.out test52.out test65.out test66.out
+  
+  SCRIPTS32 =	test50.out
+  
+--- 45,51 ----
+  		test15.out test17.out test18.out test21.out test26.out \
+  		test30.out test31.out test32.out test33.out test34.out \
+  		test37.out test38.out test39.out test40.out test41.out \
+! 		test42.out test52.out test65.out test66.out test67.out
+  
+  SCRIPTS32 =	test50.out
+  
+*** ../vim-7.2.259/src/testdir/Make_os2.mak	2009-03-11 16:36:04.000000000 +0100
+--- src/testdir/Make_os2.mak	2009-09-11 16:30:52.000000000 +0200
+***************
+*** 26,32 ****
+  		test48.out test51.out test53.out test54.out test55.out \
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+! 		test66.out
+  
+  .SUFFIXES: .in .out
+  
+--- 26,32 ----
+  		test48.out test51.out test53.out test54.out test55.out \
+  		test56.out test57.out test58.out test59.out test60.out \
+  		test61.out test62.out test63.out test64.out test65.out \
+! 		test66.out test67.out
+  
+  .SUFFIXES: .in .out
+  
+*** ../vim-7.2.259/src/testdir/Make_vms.mms	2009-03-11 16:36:04.000000000 +0100
+--- src/testdir/Make_vms.mms	2009-09-11 16:31:06.000000000 +0200
+***************
+*** 4,10 ****
+  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
+  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
+  #
+! # Last change:  2009 Mar 05
+  #
+  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
+  # Edit the lines in the Configuration section below to select.
+--- 4,10 ----
+  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
+  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
+  #
+! # Last change:  2009 Sep 11
+  #
+  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
+  # Edit the lines in the Configuration section below to select.
+***************
+*** 69,75 ****
+  	 test48.out test51.out test53.out test54.out test55.out \
+  	 test56.out test57.out test60.out \
+  	 test61.out test62.out test63.out test64.out test65.out \
+! 	 test66.out
+  
+  .IFDEF WANT_GUI
+  SCRIPT_GUI = test16.out
+--- 69,75 ----
+  	 test48.out test51.out test53.out test54.out test55.out \
+  	 test56.out test57.out test60.out \
+  	 test61.out test62.out test63.out test64.out test65.out \
+! 	 test66.out test67.out
+  
+  .IFDEF WANT_GUI
+  SCRIPT_GUI = test16.out
+*** ../vim-7.2.259/src/version.c	2009-09-11 17:24:01.000000000 +0200
+--- src/version.c	2009-09-18 14:57:05.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     260,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+251. You've never seen your closest friends who usually live WAY too far away.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.261 b/vim/vim-7.2/7.2.261
new file mode 100644
index 0000000..4f8e72d
--- /dev/null
+++ b/vim/vim-7.2/7.2.261
@@ -0,0 +1,83 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.261
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.261
+Problem:    When deleting lines with a specific folding configuration E38 may
+	    appear. (Shahaf)
+Solution:   When adjusting nested folds for deleted lines take into account
+	    that they don't start at the top of the enclosing fold.
+Files:	    src/fold.c
+
+
+*** ../vim-7.2.260/src/fold.c	2009-01-06 15:01:58.000000000 +0100
+--- src/fold.c	2009-09-18 14:43:23.000000000 +0200
+***************
+*** 1607,1617 ****
+  	    }
+  	    else
+  	    {
+- 		/* 2, 3, or 5: need to correct nested folds too */
+- 		foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
+- 				  line2 - fp->fd_top, amount, amount_after);
+  		if (fp->fd_top < top)
+  		{
+  		    if (last <= line2)
+  		    {
+  			/* 2. fold contains line1, line2 is below fold */
+--- 1607,1617 ----
+  	    }
+  	    else
+  	    {
+  		if (fp->fd_top < top)
+  		{
++ 		    /* 2 or 3: need to correct nested folds too */
++ 		    foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
++ 				  line2 - fp->fd_top, amount, amount_after);
+  		    if (last <= line2)
+  		    {
+  			/* 2. fold contains line1, line2 is below fold */
+***************
+*** 1628,1634 ****
+  		}
+  		else
+  		{
+! 		    /* 5. fold is below line1 and contains line2 */
+  		    if (amount == MAXLNUM)
+  		    {
+  			fp->fd_len -= line2 - fp->fd_top + 1;
+--- 1628,1638 ----
+  		}
+  		else
+  		{
+! 		    /* 5. fold is below line1 and contains line2; need to
+! 		     * correct nested folds too */
+! 		    foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top,
+! 				  line2 - fp->fd_top, amount,
+! 				  amount_after + (fp->fd_top - top));
+  		    if (amount == MAXLNUM)
+  		    {
+  			fp->fd_len -= line2 - fp->fd_top + 1;
+*** ../vim-7.2.260/src/version.c	2009-09-18 14:58:26.000000000 +0200
+--- src/version.c	2009-09-18 15:14:40.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     261,
+  /**/
+
+-- 
+Emacs is a nice OS - but it lacks a good text editor.
+That's why I am using Vim.  --Anonymous
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.262 b/vim/vim-7.2/7.2.262
new file mode 100644
index 0000000..dc73c07
--- /dev/null
+++ b/vim/vim-7.2/7.2.262
@@ -0,0 +1,189 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.262
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.262
+Problem:    When using custom completion for a user command the pattern string
+	    goes beyond the cursor position. (Hari Krishna Dara)
+Solution:   Truncate the string at the cursor position.
+Files:	    src/ex_getln.c, src/structs.h
+
+
+*** ../vim-7.2.261/src/ex_getln.c	2009-06-24 17:04:40.000000000 +0200
+--- src/ex_getln.c	2009-09-18 16:58:16.000000000 +0200
+***************
+*** 3266,3272 ****
+      int		i, j;
+      char_u	*p1;
+      char_u	*p2;
+-     int		oldlen;
+      int		difflen;
+      int		v;
+  
+--- 3266,3271 ----
+***************
+*** 3291,3297 ****
+      out_flush();
+  
+      i = (int)(xp->xp_pattern - ccline.cmdbuff);
+!     oldlen = ccline.cmdpos - i;
+  
+      if (type == WILD_NEXT || type == WILD_PREV)
+      {
+--- 3290,3296 ----
+      out_flush();
+  
+      i = (int)(xp->xp_pattern - ccline.cmdbuff);
+!     xp->xp_pattern_len = ccline.cmdpos - i;
+  
+      if (type == WILD_NEXT || type == WILD_PREV)
+      {
+***************
+*** 3305,3322 ****
+  	/*
+  	 * Translate string into pattern and expand it.
+  	 */
+! 	if ((p1 = addstar(&ccline.cmdbuff[i], oldlen, xp->xp_context)) == NULL)
+  	    p2 = NULL;
+  	else
+  	{
+! 	    p2 = ExpandOne(xp, p1, vim_strnsave(&ccline.cmdbuff[i], oldlen),
+  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
+  							      |options, type);
+  	    vim_free(p1);
+  	    /* longest match: make sure it is not shorter (happens with :help */
+  	    if (p2 != NULL && type == WILD_LONGEST)
+  	    {
+! 		for (j = 0; j < oldlen; ++j)
+  		     if (ccline.cmdbuff[i + j] == '*'
+  			     || ccline.cmdbuff[i + j] == '?')
+  			 break;
+--- 3304,3323 ----
+  	/*
+  	 * Translate string into pattern and expand it.
+  	 */
+! 	if ((p1 = addstar(xp->xp_pattern, xp->xp_pattern_len,
+! 						     xp->xp_context)) == NULL)
+  	    p2 = NULL;
+  	else
+  	{
+! 	    p2 = ExpandOne(xp, p1,
+! 			 vim_strnsave(&ccline.cmdbuff[i], xp->xp_pattern_len),
+  		    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
+  							      |options, type);
+  	    vim_free(p1);
+  	    /* longest match: make sure it is not shorter (happens with :help */
+  	    if (p2 != NULL && type == WILD_LONGEST)
+  	    {
+! 		for (j = 0; j < xp->xp_pattern_len; ++j)
+  		     if (ccline.cmdbuff[i + j] == '*'
+  			     || ccline.cmdbuff[i + j] == '?')
+  			 break;
+***************
+*** 3331,3337 ****
+  
+      if (p2 != NULL && !got_int)
+      {
+! 	difflen = (int)STRLEN(p2) - oldlen;
+  	if (ccline.cmdlen + difflen > ccline.cmdbufflen - 4)
+  	{
+  	    v = realloc_cmdbuff(ccline.cmdlen + difflen);
+--- 3332,3338 ----
+  
+      if (p2 != NULL && !got_int)
+      {
+! 	difflen = (int)STRLEN(p2) - xp->xp_pattern_len;
+  	if (ccline.cmdlen + difflen > ccline.cmdbufflen - 4)
+  	{
+  	    v = realloc_cmdbuff(ccline.cmdlen + difflen);
+***************
+*** 3620,3625 ****
+--- 3621,3627 ----
+      expand_T	*xp;
+  {
+      xp->xp_pattern = NULL;
++     xp->xp_pattern_len = 0;
+      xp->xp_backslash = XP_BS_NONE;
+  #ifndef BACKSLASH_IN_FILENAME
+      xp->xp_shell = FALSE;
+***************
+*** 4311,4318 ****
+      }
+  
+      /* add star to file name, or convert to regexp if not exp. files. */
+!     file_str = addstar(xp->xp_pattern,
+! 			   (int)(str + col - xp->xp_pattern), xp->xp_context);
+      if (file_str == NULL)
+  	return EXPAND_UNSUCCESSFUL;
+  
+--- 4313,4320 ----
+      }
+  
+      /* add star to file name, or convert to regexp if not exp. files. */
+!     xp->xp_pattern_len = (int)(str + col - xp->xp_pattern);
+!     file_str = addstar(xp->xp_pattern, xp->xp_pattern_len, xp->xp_context);
+      if (file_str == NULL)
+  	return EXPAND_UNSUCCESSFUL;
+  
+***************
+*** 4781,4787 ****
+  	sprintf((char *)num, "%d", ccline.cmdpos);
+  	args[1] = ccline.cmdbuff;
+      }
+!     args[0] = xp->xp_pattern;
+      args[2] = num;
+  
+      /* Save the cmdline, we don't know what the function may do. */
+--- 4783,4789 ----
+  	sprintf((char *)num, "%d", ccline.cmdpos);
+  	args[1] = ccline.cmdbuff;
+      }
+!     args[0] = vim_strnsave(xp->xp_pattern, xp->xp_pattern_len);
+      args[2] = num;
+  
+      /* Save the cmdline, we don't know what the function may do. */
+***************
+*** 4797,4802 ****
+--- 4799,4805 ----
+      if (ccline.cmdbuff != NULL)
+  	ccline.cmdbuff[ccline.cmdlen] = keep;
+  
++     vim_free(args[0]);
+      return ret;
+  }
+  
+*** ../vim-7.2.261/src/structs.h	2009-07-29 12:09:49.000000000 +0200
+--- src/structs.h	2009-09-18 15:33:15.000000000 +0200
+***************
+*** 432,437 ****
+--- 432,438 ----
+  {
+      int		xp_context;		/* type of expansion */
+      char_u	*xp_pattern;		/* start of item to expand */
++     int		xp_pattern_len;		/* bytes in xp_pattern before cursor */
+  #if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
+      char_u	*xp_arg;		/* completion function */
+      int		xp_scriptID;		/* SID for completion function */
+*** ../vim-7.2.261/src/version.c	2009-09-18 15:16:37.000000000 +0200
+--- src/version.c	2009-09-18 17:23:20.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     262,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+252. You vote for foreign officials.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.263 b/vim/vim-7.2/7.2.263
new file mode 100644
index 0000000..fdbfa40
--- /dev/null
+++ b/vim/vim-7.2/7.2.263
@@ -0,0 +1,87 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.263
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.263
+Problem:    GTK2: when using the -geom argument with an offset from the right
+	    edge and the size is smaller than the default, the Vim window is
+	    not positioned properly.
+Solution:   Use another function to set the size. (Vitaly Minko)
+Files:	    src/gui_gtk_x11.c
+
+
+*** ../vim-7.2.262/src/gui_gtk_x11.c	2009-09-11 15:46:20.000000000 +0200
+--- src/gui_gtk_x11.c	2009-09-23 15:43:52.000000000 +0200
+***************
+*** 4066,4071 ****
+--- 4066,4073 ----
+  {
+      guicolor_T fg_pixel = INVALCOLOR;
+      guicolor_T bg_pixel = INVALCOLOR;
++     guint		pixel_width;
++     guint		pixel_height;
+  
+  #ifdef HAVE_GTK2
+      /*
+***************
+*** 4106,4113 ****
+  	unsigned int	w, h;
+  	int		x = 0;
+  	int		y = 0;
+- 	guint		pixel_width;
+- 	guint		pixel_height;
+  
+  	mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h);
+  
+--- 4108,4113 ----
+***************
+*** 4160,4168 ****
+  	}
+      }
+  
+!     gtk_form_set_size(GTK_FORM(gui.formwin),
+! 	    (guint)(gui_get_base_width() + Columns * gui.char_width),
+! 	    (guint)(gui_get_base_height() + Rows * gui.char_height));
+      update_window_manager_hints(0, 0);
+  
+      if (foreground_argument != NULL)
+--- 4160,4175 ----
+  	}
+      }
+  
+!     pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
+!     pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
+! #ifdef HAVE_GTK2
+!     /* For GTK2 changing the size of the form widget doesn't cause window
+!      * resizing. */
+!     if (gtk_socket_id == 0) 
+! 	gtk_window_resize(GTK_WINDOW(gui.mainwin), pixel_width, pixel_height);
+! #else
+!     gtk_form_set_size(GTK_FORM(gui.formwin), pixel_width, pixel_height);
+! #endif
+      update_window_manager_hints(0, 0);
+  
+      if (foreground_argument != NULL)
+*** ../vim-7.2.262/src/version.c	2009-09-18 17:24:54.000000000 +0200
+--- src/version.c	2009-09-23 17:34:08.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     263,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+267. You get an extra phone line so you can get phone calls.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.264 b/vim/vim-7.2/7.2.264
new file mode 100644
index 0000000..808f291
--- /dev/null
+++ b/vim/vim-7.2/7.2.264
@@ -0,0 +1,168 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.264
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.264
+Problem:    GTK2: When the Vim window is maximized setting 'columns' or
+	    'lines' doesn't work.
+Solution:   Unmaximize the window before setting the size. (Vitaly Minko)
+Files:	    src/gui.c, src/gui_gtk_x11.c, src/proto/gui_gtk_x11.pro
+
+
+*** ../vim-7.2.263/src/gui.c	2009-07-29 11:10:31.000000000 +0200
+--- src/gui.c	2009-09-23 16:28:09.000000000 +0200
+***************
+*** 1386,1391 ****
+--- 1386,1395 ----
+      int		min_height;
+      int		screen_w;
+      int		screen_h;
++ #ifdef HAVE_GTK2
++     int		un_maximize = mustset;
++     int         did_adjust = 0;
++ #endif
+  
+      if (!gui.shell_created)
+  	return;
+***************
+*** 1425,1446 ****
+  	    if (Columns < MIN_COLUMNS)
+  		Columns = MIN_COLUMNS;
+  	    width = Columns * gui.char_width + base_width;
+  	}
+  	if ((direction & RESIZE_VERT) && height > screen_h)
+  	{
+  	    Rows = (screen_h - base_height) / gui.char_height;
+  	    check_shellsize();
+  	    height = Rows * gui.char_height + base_height;
+  	}
+      }
+      gui.num_cols = Columns;
+      gui.num_rows = Rows;
+  
+      min_width = base_width + MIN_COLUMNS * gui.char_width;
+      min_height = base_height + MIN_LINES * gui.char_height;
+! # ifdef FEAT_WINDOWS
+      min_height += tabline_height() * gui.char_height;
+! # endif
+  
+      gui_mch_set_shellsize(width, height, min_width, min_height,
+  					  base_width, base_height, direction);
+--- 1429,1475 ----
+  	    if (Columns < MIN_COLUMNS)
+  		Columns = MIN_COLUMNS;
+  	    width = Columns * gui.char_width + base_width;
++ #ifdef HAVE_GTK2
++ 	    ++did_adjust;
++ #endif
+  	}
+  	if ((direction & RESIZE_VERT) && height > screen_h)
+  	{
+  	    Rows = (screen_h - base_height) / gui.char_height;
+  	    check_shellsize();
+  	    height = Rows * gui.char_height + base_height;
++ #ifdef HAVE_GTK2
++ 	    ++did_adjust;
++ #endif
+  	}
++ #ifdef HAVE_GTK2
++ 	if (did_adjust == 2 || (width + gui.char_width >= screen_w
++ 				     && height + gui.char_height >= screen_h))
++ 	    /* don't unmaximize if at maximum size */
++ 	    un_maximize = FALSE;
++ #endif
+      }
+      gui.num_cols = Columns;
+      gui.num_rows = Rows;
+  
+      min_width = base_width + MIN_COLUMNS * gui.char_width;
+      min_height = base_height + MIN_LINES * gui.char_height;
+! #ifdef FEAT_WINDOWS
+      min_height += tabline_height() * gui.char_height;
+! #endif
+! 
+! #ifdef HAVE_GTK2
+!     if (un_maximize)
+!     {
+! 	/* If the window size is smaller than the screen unmaximize the
+! 	 * window, otherwise resizing won't work. */
+! 	gui_mch_get_screen_dimensions(&screen_w, &screen_h);
+! 	if ((width + gui.char_width < screen_w
+! 				   || height + gui.char_height * 2 < screen_h)
+! 		&& gui_mch_maximized())
+! 	    gui_mch_unmaximize();
+!     }
+! #endif
+  
+      gui_mch_set_shellsize(width, height, min_width, min_height,
+  					  base_width, base_height, direction);
+*** ../vim-7.2.263/src/gui_gtk_x11.c	2009-09-23 17:35:17.000000000 +0200
+--- src/gui_gtk_x11.c	2009-09-23 15:43:52.000000000 +0200
+***************
+*** 4376,4381 ****
+--- 4376,4404 ----
+  #endif
+  #endif /* HAVE_GTK2 */
+  
++ #if defined(HAVE_GTK2) || defined(PROTO)
++ /*
++  * Return TRUE if the main window is maximized.
++  */
++     int
++ gui_mch_maximized()
++ {
++     return (gui.mainwin != NULL && gui.mainwin->window != NULL
++ 	    && (gdk_window_get_state(gui.mainwin->window)
++ 					       & GDK_WINDOW_STATE_MAXIMIZED));
++ }
++ 
++ /*
++  * Unmaximize the main window
++  */
++     void
++ gui_mch_unmaximize()
++ {
++     if (gui.mainwin != NULL)
++ 	gtk_window_unmaximize(GTK_WINDOW(gui.mainwin));
++ }
++ #endif
++ 
+  /*
+   * Set the windows size.
+   */
+*** ../vim-7.2.263/src/proto/gui_gtk_x11.pro	2007-05-05 19:18:54.000000000 +0200
+--- src/proto/gui_gtk_x11.pro	2009-09-23 15:43:45.000000000 +0200
+***************
+*** 16,21 ****
+--- 16,23 ----
+  void gui_mch_exit __ARGS((int rc));
+  int gui_mch_get_winpos __ARGS((int *x, int *y));
+  void gui_mch_set_winpos __ARGS((int x, int y));
++ int gui_mch_maximized __ARGS((void));
++ void gui_mch_unmaximize __ARGS((void));
+  void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
+  void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
+  void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
+*** ../vim-7.2.263/src/version.c	2009-09-23 17:35:17.000000000 +0200
+--- src/version.c	2009-09-23 18:12:21.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     264,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+268. You get up in the morning and go online before getting your coffee.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.265 b/vim/vim-7.2/7.2.265
new file mode 100644
index 0000000..4685150
--- /dev/null
+++ b/vim/vim-7.2/7.2.265
@@ -0,0 +1,56 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.265
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.265
+Problem:    When using ":silent broken" inside try/catch silency may persist.
+	    (dr-dr xp)
+Solution:   Set msg_silent when there is an error and it's bigger than the
+	    saved value.
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-7.2.264/src/ex_docmd.c	2009-07-09 20:13:59.000000000 +0200
+--- src/ex_docmd.c	2009-09-30 11:40:53.000000000 +0200
+***************
+*** 2695,2701 ****
+      {
+  	/* messages could be enabled for a serious error, need to check if the
+  	 * counters don't become negative */
+! 	if (!did_emsg)
+  	    msg_silent = save_msg_silent;
+  	emsg_silent -= did_esilent;
+  	if (emsg_silent < 0)
+--- 2695,2701 ----
+      {
+  	/* messages could be enabled for a serious error, need to check if the
+  	 * counters don't become negative */
+! 	if (!did_emsg || msg_silent > save_msg_silent)
+  	    msg_silent = save_msg_silent;
+  	emsg_silent -= did_esilent;
+  	if (emsg_silent < 0)
+*** ../vim-7.2.264/src/version.c	2009-09-23 18:14:13.000000000 +0200
+--- src/version.c	2009-09-30 13:22:47.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     265,
+  /**/
+
+-- 
+FIRST HEAD:  Oh! quick! get the sword out I want to cut his head off.
+THIRD HEAD:  Oh, cut your own head off.
+SECOND HEAD: Yes - do us all a favour.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.266 b/vim/vim-7.2/7.2.266
new file mode 100644
index 0000000..3a5ba77
--- /dev/null
+++ b/vim/vim-7.2/7.2.266
@@ -0,0 +1,244 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.266
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.266
+Problem:    When an expression abbreviation is triggered, the typed character
+	    is unknown.
+Solution:   Make the typed character available in v:char.
+Files:	    runtime/doc/map.txt, src/eval.c, src/getchar.c, src/ops.c,
+	    src/proto/eval.pro
+
+
+*** ../vim-7.2.265/runtime/doc/map.txt	2008-08-09 19:36:49.000000000 +0200
+--- runtime/doc/map.txt	2009-09-23 19:39:19.000000000 +0200
+***************
+*** 224,229 ****
+--- 224,233 ----
+  The result of the InsertDot() function will be inserted.  It could check the
+  text before the cursor and start omni completion when some condition is met.
+  
++ For abbreviations |v:char| is set to the character that was typed to trigger
++ the abbreviation.  You can use this to decide how to expand the {lhs}.  You
++ can't change v:char and you should not insert it.
++ 
+  Be very careful about side effects!  The expression is evaluated while
+  obtaining characters, you may very well make the command dysfunctional.
+  For this reason the following is blocked:
+*** ../vim-7.2.265/src/eval.c	2009-06-03 14:25:47.000000000 +0200
+--- src/eval.c	2009-09-23 19:36:32.000000000 +0200
+***************
+*** 18101,18106 ****
+--- 18101,18131 ----
+  }
+  
+  /*
++  * Set v:char to character "c".
++  */
++     void
++ set_vim_var_char(c)
++     int c;
++ {
++ #ifdef FEAT_MBYTE
++     char_u	buf[MB_MAXBYTES];
++ #else
++     char_u	buf[2];
++ #endif
++ 
++ #ifdef FEAT_MBYTE
++     if (has_mbyte)
++ 	buf[(*mb_char2bytes)(c, buf)] = NUL;
++     else
++ #endif
++     {
++ 	buf[0] = c;
++ 	buf[1] = NUL;
++     }
++     set_vim_var_string(VV_CHAR, buf, -1);
++ }
++ 
++ /*
+   * Set v:count to "count" and v:count1 to "count1".
+   * When "set_prevcount" is TRUE first set v:prevcount from v:count.
+   */
+*** ../vim-7.2.265/src/getchar.c	2009-07-14 13:44:43.000000000 +0200
+--- src/getchar.c	2009-09-23 19:35:54.000000000 +0200
+***************
+*** 129,135 ****
+  static void	validate_maphash __ARGS((void));
+  static void	showmap __ARGS((mapblock_T *mp, int local));
+  #ifdef FEAT_EVAL
+! static char_u	*eval_map_expr __ARGS((char_u *str));
+  #endif
+  
+  /*
+--- 129,135 ----
+  static void	validate_maphash __ARGS((void));
+  static void	showmap __ARGS((mapblock_T *mp, int local));
+  #ifdef FEAT_EVAL
+! static char_u	*eval_map_expr __ARGS((char_u *str, int c));
+  #endif
+  
+  /*
+***************
+*** 2446,2452 ****
+  			    if (tabuf.typebuf_valid)
+  			    {
+  				vgetc_busy = 0;
+! 				s = eval_map_expr(mp->m_str);
+  				vgetc_busy = save_vgetc_busy;
+  			    }
+  			    else
+--- 2446,2452 ----
+  			    if (tabuf.typebuf_valid)
+  			    {
+  				vgetc_busy = 0;
+! 				s = eval_map_expr(mp->m_str, NUL);
+  				vgetc_busy = save_vgetc_busy;
+  			    }
+  			    else
+***************
+*** 4367,4375 ****
+  	     * abbreviation, but is not inserted into the input stream.
+  	     */
+  	    j = 0;
+- 					/* special key code, split up */
+  	    if (c != Ctrl_RSB)
+  	    {
+  		if (IS_SPECIAL(c) || c == K_SPECIAL)
+  		{
+  		    tb[j++] = K_SPECIAL;
+--- 4367,4375 ----
+  	     * abbreviation, but is not inserted into the input stream.
+  	     */
+  	    j = 0;
+  	    if (c != Ctrl_RSB)
+  	    {
++ 					/* special key code, split up */
+  		if (IS_SPECIAL(c) || c == K_SPECIAL)
+  		{
+  		    tb[j++] = K_SPECIAL;
+***************
+*** 4398,4404 ****
+  	    }
+  #ifdef FEAT_EVAL
+  	    if (mp->m_expr)
+! 		s = eval_map_expr(mp->m_str);
+  	    else
+  #endif
+  		s = mp->m_str;
+--- 4398,4404 ----
+  	    }
+  #ifdef FEAT_EVAL
+  	    if (mp->m_expr)
+! 		s = eval_map_expr(mp->m_str, c);
+  	    else
+  #endif
+  		s = mp->m_str;
+***************
+*** 4434,4441 ****
+   * special characters.
+   */
+      static char_u *
+! eval_map_expr(str)
+      char_u	*str;
+  {
+      char_u	*res;
+      char_u	*p;
+--- 4434,4442 ----
+   * special characters.
+   */
+      static char_u *
+! eval_map_expr(str, c)
+      char_u	*str;
++     int		c;	    /* NUL or typed character for abbreviation */
+  {
+      char_u	*res;
+      char_u	*p;
+***************
+*** 4452,4457 ****
+--- 4453,4459 ----
+  #ifdef FEAT_EX_EXTRA
+      ++ex_normal_lock;
+  #endif
++     set_vim_var_char(c);  /* set v:char to the typed character */
+      save_cursor = curwin->w_cursor;
+      p = eval_to_string(str, NULL, FALSE);
+      --textlock;
+*** ../vim-7.2.265/src/ops.c	2009-07-01 18:04:30.000000000 +0200
+--- src/ops.c	2009-09-23 19:11:40.000000000 +0200
+***************
+*** 4473,4483 ****
+      int		use_sandbox = was_set_insecurely((char_u *)"formatexpr",
+  								   OPT_LOCAL);
+      int		r;
+- #ifdef FEAT_MBYTE
+-     char_u	buf[MB_MAXBYTES];
+- #else
+-     char_u	buf[2];
+- #endif
+  
+      /*
+       * Set v:lnum to the first line number and v:count to the number of lines.
+--- 4473,4478 ----
+***************
+*** 4485,4501 ****
+       */
+      set_vim_var_nr(VV_LNUM, lnum);
+      set_vim_var_nr(VV_COUNT, count);
+! 
+! #ifdef FEAT_MBYTE
+!     if (has_mbyte)
+! 	buf[(*mb_char2bytes)(c, buf)] = NUL;
+!     else
+! #endif
+!     {
+! 	buf[0] = c;
+! 	buf[1] = NUL;
+!     }
+!     set_vim_var_string(VV_CHAR, buf, -1);
+  
+      /*
+       * Evaluate the function.
+--- 4480,4486 ----
+       */
+      set_vim_var_nr(VV_LNUM, lnum);
+      set_vim_var_nr(VV_COUNT, count);
+!     set_vim_var_char(c);
+  
+      /*
+       * Evaluate the function.
+*** ../vim-7.2.265/src/proto/eval.pro	2008-11-20 16:11:03.000000000 +0100
+--- src/proto/eval.pro	2009-09-23 19:36:30.000000000 +0200
+***************
+*** 61,66 ****
+--- 61,67 ----
+  long get_vim_var_nr __ARGS((int idx));
+  char_u *get_vim_var_str __ARGS((int idx));
+  list_T *get_vim_var_list __ARGS((int idx));
++ void set_vim_var_char __ARGS((int c));
+  void set_vcount __ARGS((long count, long count1, int set_prevcount));
+  void set_vim_var_string __ARGS((int idx, char_u *val, int len));
+  void set_vim_var_list __ARGS((int idx, list_T *val));
+*** ../vim-7.2.265/src/version.c	2009-09-30 13:23:57.000000000 +0200
+--- src/version.c	2009-09-30 15:11:29.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     266,
+  /**/
+
+-- 
+Life would be so much easier if we could just look at the source code.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/7.2.267 b/vim/vim-7.2/7.2.267
new file mode 100644
index 0000000..6df92c9
--- /dev/null
+++ b/vim/vim-7.2/7.2.267
@@ -0,0 +1,47 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.267
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.267
+Problem:    Crash for narrow window and double-width character.
+Solution:   Check for zero width.  (Taro Muraoka)
+Files:	    src/charset.c
+
+
+*** ../vim-7.2.266/src/charset.c	2009-09-11 14:02:25.000000000 +0200
+--- src/charset.c	2009-10-07 16:17:27.000000000 +0200
+***************
+*** 1218,1223 ****
+--- 1218,1225 ----
+      if ((int)vcol == width1 - 1)
+  	return TRUE;
+      width2 = width1 + win_col_off2(wp);
++     if (width2 <= 0)
++ 	return FALSE;
+      return ((vcol - width1) % width2 == width2 - 1);
+  }
+  #endif /* FEAT_MBYTE */
+*** ../vim-7.2.266/src/version.c	2009-09-30 15:15:33.000000000 +0200
+--- src/version.c	2009-10-07 16:19:05.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     267,
+  /**/
+
+-- 
+You got to work at a mill?  Lucky!  I got sent back to work in the
+acid-mines for my daily crust of stale bread... which not even the
+birds would eat.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim/vim-7.2/keymap/dvorak.vim b/vim/vim-7.2/keymap/dvorak.vim
new file mode 100644
index 0000000..77dc530
--- /dev/null
+++ b/vim/vim-7.2/keymap/dvorak.vim
@@ -0,0 +1,82 @@
+" Maintainer:   Ashish SHUKLA <wahjava@members.fsf.org>
+" Last Changed: 2009 Jul 04
+"
+" All characters are ASCII, conversion to another encoding (e.g., UTF-8)
+" should work.
+
+let b:keymap_name = "en-dv"
+
+loadkeymap
+q	'
+w	,
+e	.
+r	p
+t	y
+y	f
+u	g
+i	c
+o	r
+p	l
+[	/
+]	=
+\\	\\
+a	a
+s	o
+d	e
+f	u
+g	i
+h	d
+j	h
+k	t
+l	n
+;	s
+'	-
+z	;
+x	q
+c	j
+v	k
+b	x
+n	b
+m	m
+,	w
+.	v
+/	z
+Z	:
+X	Q
+C	J
+V	K
+B	X
+N	B
+M	M
+<	W
+>	V
+?	Z
+A	A
+S	O
+D	E
+F	U
+G	I
+H	D
+J	H
+K	T
+L	N
+:	S
+\"	_
+Q	"
+W	<
+E	>
+R	P
+T	Y
+Y	F
+U	G
+I	C
+O	R
+P	L
+{	?
+}	+
+|	|
+-	[
+_	{
+=	]
++	}
+
diff --git a/vim/vim-7.2/syntax/taskdata.vim b/vim/vim-7.2/syntax/taskdata.vim
new file mode 100644
index 0000000..79186e0
--- /dev/null
+++ b/vim/vim-7.2/syntax/taskdata.vim
@@ -0,0 +1,43 @@
+" Vim syntax file
+" Language:	task data
+" Maintainer:	John Florian <jflorian@doubledog.org>
+" Updated:	Wed Jul  8 19:46:20 EDT 2009
+
+
+" For version 5.x: Clear all syntax items.
+" For version 6.x: Quit when a syntax file was already loaded.
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+" Key Names for values.
+syn keyword taskdataKey		description due end entry imask mask parent
+syn keyword taskdataKey		priority project recur start status tags uuid
+syn match taskdataKey		"annotation_\d\+"
+syn match taskdataUndo		"^time.*$"
+syn match taskdataUndo		"^\(old \|new \|---\)"
+
+" Values associated with key names.
+"
+" Strings
+syn region taskdataString	matchgroup=Normal start=+"+ end=+"+
+			\	contains=taskdataEncoded,taskdataUUID,@Spell
+"
+" Special Embedded Characters (e.g., "&comma;")
+syn match taskdataEncoded	"&\a\+;" contained
+" UUIDs
+syn match taskdataUUID		"\x\{8}-\(\x\{4}-\)\{3}\x\{12}" contained
+
+
+" The default methods for highlighting.  Can be overridden later.
+hi def link taskdataEncoded	Function
+hi def link taskdataKey		Statement
+hi def link taskdataString 	String
+hi def link taskdataUUID 	Special
+hi def link taskdataUndo 	Type
+
+let b:current_syntax = "taskdata"
+
+" vim:noexpandtab
diff --git a/vim/vim-7.2/syntax/taskedit.vim b/vim/vim-7.2/syntax/taskedit.vim
new file mode 100644
index 0000000..c7e0ea7
--- /dev/null
+++ b/vim/vim-7.2/syntax/taskedit.vim
@@ -0,0 +1,35 @@
+" Vim syntax file
+" Language:	support for 'task 42 edit'
+" Maintainer:	John Florian <jflorian@doubledog.org>
+" Updated:	Wed Jul  8 19:46:32 EDT 2009
+
+
+" For version 5.x: Clear all syntax items.
+" For version 6.x: Quit when a syntax file was already loaded.
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syn match taskeditHeading	"^\s*#\s*Name\s\+Editable details\s*$" contained
+syn match taskeditHeading	"^\s*#\s*-\+\s\+-\+\s*$" contained
+syn match taskeditReadOnly	"^\s*#\s*\(UU\)\?ID:.*$" contained
+syn match taskeditReadOnly	"^\s*#\s*Status:.*$" contained
+syn match taskeditReadOnly	"^\s*#\s*i\?Mask:.*$" contained
+syn match taskeditKey		"^ *.\{-}:" nextgroup=taskeditString
+syn match taskeditComment	"^\s*#.*$"
+			\	contains=taskeditReadOnly,taskeditHeading
+syn match taskeditString	".*$" contained contains=@Spell
+
+
+" The default methods for highlighting.  Can be overridden later.
+hi def link taskeditComment	Comment
+hi def link taskeditHeading	Function
+hi def link taskeditKey		Statement
+hi def link taskeditReadOnly	Special
+hi def link taskeditString	String
+
+let b:current_syntax = "taskedit"
+
+" vim:noexpandtab
diff --git a/weechat-git/PKGBUILD b/weechat-git/PKGBUILD
index 6c18c93..2f94f79 100644
--- a/weechat-git/PKGBUILD
+++ b/weechat-git/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Tim Zebulla <amon at faumrahrer dot de>
 
 pkgname=weechat-git
-pkgver=20091022
+pkgver=20100107
 pkgrel=1
 pkgdesc="Fast, light & extensible IRC client (curses UI)"
 arch=('i686' 'x86_64')
@@ -13,7 +13,8 @@ makedepends=('git' 'cmake')
 optdepends=('tcl: tcl scripting support'
             'perl>=5.10: perl scripting support' 
             'python>=2.6: python scripting support' 
-            'lua: lua scripting support')
+            'lua: lua scripting support'
+            'ruby: ruby scripting support')
 provides=('weechat')
 conflicts=('weechat')
 options=(!strip)
@@ -41,9 +42,9 @@ build() {
   git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
   cd "$srcdir/$_gitname-build"
 
-  cmake -DCMAKE_BUILD_TYPE=Debug -DDISABLE_RUBY=ON -DDISABLE_DOC=ON -DPREFIX=/usr || return 1
+  cmake -DCMAKE_BUILD_TYPE=Debug -DDISABLE_DOC=ON -DPREFIX=/usr || return 1
   make DESTDIR="$pkgdir/" install
 } 
-# note - to disable an option, use -DDISABLE_JABBER=ON
-# this should change soon, and will be -DENABLE_JABBER=OFF
+# note - to disable an option, use -DDISABLE_RUBY=ON
+# this should change soon, and will be -DENABLE_RUBY=OFF
 # also, you can see the configure options with ccmake, then just -DOPTIONHERE=ON/OFF  
diff --git a/weechat/PKGBUILD b/weechat/PKGBUILD
new file mode 100644
index 0000000..709bf93
--- /dev/null
+++ b/weechat/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: lucke <lucke at o2 dot pl>
+
+pkgname=weechat
+pkgver=0.3.0
+pkgrel=2
+pkgdesc="Fast, light and extensible IRC client (curses UI)"
+arch=('i686' 'x86_64')
+url="http://www.weechat.org/"
+license=('GPL')
+depends=('gnutls>=2.6.4' 'aspell' 'tcl')
+makedepends=('pkgconfig' 'perl>=5.10' 'python>=2.6' 'lua')
+optdepends=('perl>=5.10' 'python>=2.6' 'lua' 'ruby')
+source=(http://www.weechat.org/files/src/$pkgname-$pkgver.tar.bz2)
+options=(!libtool)
+md5sums=('c31cfc229e964ff9257cc9c7f9e6c9bc')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+              --enable-ruby \
+              --with-debug=0 LDFLAGS="-lm -ldl"
+  make || return 1
+  make DESTDIR="${pkgdir}/" install
+}