[arch-commits] CVS update of arch/build/base/vim (3 files)
Tobias Kieslich
tobias at archlinux.org
Mon Apr 23 19:20:39 UTC 2007
Date: Monday, April 23, 2007 @ 15:20:39
Author: tobias
Path: /home/cvs-arch/arch/build/base/vim
Modified: PKGBUILD (1.39 -> 1.40) cumulative.patch (1.5 -> 1.6)
runtime.tar.gz (1.2 -> 1.3)
upgpkg: vim/gvim upgraded to patch level 224 and updated runtime (seems new
script works well, we might consider incorporating this into
the build function to make pacbuild happy)
gimp upstream update
------------------+
PKGBUILD | 8
cumulative.patch | 558 +++++++++++++++++++++++++++++++++++++++++++++++++++++
runtime.tar.gz | <<Binary file>>
3 files changed, 563 insertions(+), 4 deletions(-)
Index: arch/build/base/vim/PKGBUILD
diff -u arch/build/base/vim/PKGBUILD:1.39 arch/build/base/vim/PKGBUILD:1.40
--- arch/build/base/vim/PKGBUILD:1.39 Wed Mar 21 15:18:42 2007
+++ arch/build/base/vim/PKGBUILD Mon Apr 23 15:20:38 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.39 2007/03/21 19:18:42 tobias Exp $
+# $Id: PKGBUILD,v 1.40 2007/04/23 19:20:38 tobias Exp $
# Maintainer: judd <jvinet at zeroflux.org>
# ATTENTION: due to the high number of patches and the subsequent big
@@ -10,7 +10,7 @@
pkgname=vim
_srcver=7.0
-_patchlevel=219
+_patchlevel=224
pkgver=${_srcver}.${_patchlevel}
pkgrel=1
pkgdesc="a highly configurable, improved version of the vi text editor built to enable efficient text editing"
@@ -27,8 +27,8 @@
ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \
runtime.tar.gz filetype.patch cumulative.patch)
md5sums=('4ca69757678272f718b1041c810d82d8' '200f741ecc2a896fca25486764fa18a2'\
- '6d43efaff570b5c86e76b833ea0c6a04' '4f8452740ee18d70a53431e54fb07664'\
- 'f85f0565ebab869b0b0aa60fa5b86d75' '11735ae2c6b9f6b7033831272808afc0')
+ '6d43efaff570b5c86e76b833ea0c6a04' 'fcf933acd3876828ea54c4f5984570ed'\
+ 'f85f0565ebab869b0b0aa60fa5b86d75' 'f2f53988672aa6bb35195ff046238d27')
build()
{
Index: arch/build/base/vim/cumulative.patch
diff -u arch/build/base/vim/cumulative.patch:1.5 arch/build/base/vim/cumulative.patch:1.6
--- arch/build/base/vim/cumulative.patch:1.5 Wed Mar 21 15:18:42 2007
+++ arch/build/base/vim/cumulative.patch Mon Apr 23 15:20:38 2007
@@ -27744,3 +27744,561 @@
/// 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 ///
+To: vim-dev at vim.org
+Subject: patch 7.0.220
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.220
+Problem: Crash when using winnr('#') in a new tab page. (Andy Wokula)
+Solution: Check for not finding the window.
+Files: src/eval.c
+
+
+*** ../vim-7.0.219/src/eval.c Tue Feb 20 03:18:20 2007
+--- src/eval.c Sun Mar 25 17:43:53 2007
+***************
+*** 15769,15775 ****
+--- 15769,15783 ----
+ if (nr > 0)
+ for (wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
+ wp != twin; wp = wp->w_next)
++ {
++ if (wp == NULL)
++ {
++ /* didn't find it in this tabpage */
++ nr = 0;
++ break;
++ }
+ ++nr;
++ }
+ return nr;
+ }
+ #endif
+*** ../vim-7.0.219/src/version.c Sun Mar 18 21:52:09 2007
+--- src/version.c Sun Mar 25 17:48:20 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 220,
+ /**/
+
+--
+Men may not be seen publicly in any kind of strapless gown.
+ [real standing law in Florida, United States of America]
+
+ /// Bram Moolenaar -- Bram at 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 ///
+To: vim-dev at vim.org
+Subject: patch 7.0.221
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.221
+Problem: finddir() uses 'path' by default, where "." means relative to the
+ current file. But it works relative to the current directory.
+ (Tye Zdrojewski)
+Solution: Add the current buffer name to find_file_in_path_option() for the
+ relative file name.
+Files: runtime/doc/eval.txt, src/eval.c
+
+
+*** ../vim-7.0.220/runtime/doc/eval.txt Sun Feb 4 02:59:04 2007
+--- runtime/doc/eval.txt Mon Mar 26 20:49:06 2007
+***************
+*** 2541,2550 ****
+
+
+ finddir({name}[, {path}[, {count}]]) *finddir()*
+! Find directory {name} in {path}. Returns the path of the
+! first found match. When the found directory is below the
+! current directory a relative path is returned. Otherwise a
+! full path is returned.
+ If {path} is omitted or empty then 'path' is used.
+ If the optional {count} is given, find {count}'s occurrence of
+ {name} in {path} instead of the first one.
+--- 2565,2576 ----
+
+
+ finddir({name}[, {path}[, {count}]]) *finddir()*
+! Find directory {name} in {path}. Supports both downwards and
+! upwards recursive directory searches. See |file-searching|
+! for the syntax of {path}.
+! Returns the path of the first found match. When the found
+! directory is below the current directory a relative path is
+! returned. Otherwise a full path is returned.
+ If {path} is omitted or empty then 'path' is used.
+ If the optional {count} is given, find {count}'s occurrence of
+ {name} in {path} instead of the first one.
+*** ../vim-7.0.220/src/eval.c Sun Mar 25 17:50:22 2007
+--- src/eval.c Sun Mar 25 17:43:53 2007
+***************
+*** 9195,9201 ****
+ vim_free(fresult);
+ fresult = find_file_in_path_option(first ? fname : NULL,
+ first ? (int)STRLEN(fname) : 0,
+! 0, first, path, dir, NULL,
+ dir ? (char_u *)"" : curbuf->b_p_sua);
+ first = FALSE;
+
+--- 9195,9201 ----
+ vim_free(fresult);
+ fresult = find_file_in_path_option(first ? fname : NULL,
+ first ? (int)STRLEN(fname) : 0,
+! 0, first, path, dir, curbuf->b_ffname,
+ dir ? (char_u *)"" : curbuf->b_p_sua);
+ first = FALSE;
+
+*** ../vim-7.0.220/src/version.c Sun Mar 25 17:50:22 2007
+--- src/version.c Tue Mar 27 10:16:35 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 221,
+ /**/
+
+--
+Beer & pretzels can't be served at the same time in any bar or restaurant.
+ [real standing law in North Dakota, United States of America]
+
+ /// Bram Moolenaar -- Bram at 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 ///
+To: vim-dev at vim.org
+Subject: patch 7.0.222
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.222
+Problem: Perl indenting using 'cindent' works almost right.
+Solution: Recognize '#' to start a comment. (Alex Manoussakis) Added '#'
+ flag in 'cinoptions'.
+Files: runtime/doc/indent.txt, src/misc1.c
+
+
+*** ../vim-7.0.221/runtime/doc/indent.txt Sun May 7 17:00:59 2006
+--- runtime/doc/indent.txt Sat Mar 17 16:27:57 2007
+***************
+*** 1,4 ****
+! *indent.txt* For Vim version 7.0. Last change: 2006 Apr 30
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+--- 1,4 ----
+! *indent.txt* For Vim version 7.0. Last change: 2007 Mar 17
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+***************
+*** 434,443 ****
+ limits the time needed to search for the start of a comment.
+ (default 30 lines).
+
+
+ The defaults, spelled out in full, are:
+ cinoptions=>s,e0,n0,f0,{0,}0,^0,:s,=s,l0,b0,gs,hs,ps,ts,is,+s,c3,C0,
+! /0,(2s,us,U0,w0,W0,m0,j0,)20,*30
+
+ Vim puts a line in column 1 if:
+ - It starts with '#' (preprocessor directives), if 'cinkeys' contains '#'.
+--- 434,448 ----
+ limits the time needed to search for the start of a comment.
+ (default 30 lines).
+
++ #N When N is non-zero recognize shell/Perl comments, starting with
++ '#'. Default N is zero: don't recognizes '#' comments. Note
++ that lines starting with # will still be seen as preprocessor
++ lines.
++
+
+ The defaults, spelled out in full, are:
+ cinoptions=>s,e0,n0,f0,{0,}0,^0,:s,=s,l0,b0,gs,hs,ps,ts,is,+s,c3,C0,
+! /0,(2s,us,U0,w0,W0,m0,j0,)20,*30,#0
+
+ Vim puts a line in column 1 if:
+ - It starts with '#' (preprocessor directives), if 'cinkeys' contains '#'.
+*** ../vim-7.0.221/src/misc1.c Tue Oct 24 21:15:09 2006
+--- src/misc1.c Sat Mar 17 16:36:00 2007
+***************
+*** 4796,4803 ****
+--- 4796,4806 ----
+ static int find_last_paren __ARGS((char_u *l, int start, int end));
+ static int find_match __ARGS((int lookfor, linenr_T ourscope, int ind_maxparen, int ind_maxcomment));
+
++ static int ind_hash_comment = 0; /* # starts a comment */
++
+ /*
+ * Skip over white space and C comments within the line.
++ * Also skip over Perl/shell comments if desired.
+ */
+ static char_u *
+ cin_skipcomment(s)
+***************
+*** 4805,4811 ****
+--- 4808,4824 ----
+ {
+ while (*s)
+ {
++ char_u *prev_s = s;
++
+ s = skipwhite(s);
++
++ /* Perl/shell # comment comment continues until eol. Require a space
++ * before # to avoid recognizing $#array. */
++ if (ind_hash_comment != 0 && s != prev_s && *s == '#')
++ {
++ s += STRLEN(s);
++ break;
++ }
+ if (*s != '/')
+ break;
+ ++s;
+***************
+*** 6133,6139 ****
+ if (l[1] == '-')
+ n = -n;
+ /* When adding an entry here, also update the default 'cinoptions' in
+! * change.txt, and add explanation for it! */
+ switch (*l)
+ {
+ case '>': ind_level = n; break;
+--- 6146,6152 ----
+ if (l[1] == '-')
+ n = -n;
+ /* When adding an entry here, also update the default 'cinoptions' in
+! * doc/indent.txt, and add explanation for it! */
+ switch (*l)
+ {
+ case '>': ind_level = n; break;
+***************
+*** 6166,6171 ****
+--- 6179,6185 ----
+ case 'h': ind_scopedecl_code = n; break;
+ case 'j': ind_java = n; break;
+ case 'l': ind_keep_case_label = n; break;
++ case '#': ind_hash_comment = n; break;
+ }
+ }
+
+*** ../vim-7.0.221/src/version.c Tue Mar 27 10:20:59 2007
+--- src/version.c Tue Mar 27 10:56:50 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 222,
+ /**/
+
+--
+My Go , this amn keyboar oesn't have a .
+
+ /// Bram Moolenaar -- Bram at 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 ///
+To: vim-dev at vim.org
+Subject: patch 7.0.223
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.223
+Problem: Unprintable characters in completion text mess up the popup menu.
+ (Gombault Damien)
+Solution: Use strtrans() to make the text printable.
+Files: src/charset.c, src/popupmnu.c
+
+
+*** ../vim-7.0.222/src/charset.c Tue Apr 18 00:04:40 2006
+--- src/charset.c Sat Mar 24 21:10:37 2007
+***************
+*** 317,323 ****
+ }
+ }
+
+! #if defined(FEAT_EVAL) || defined(FEAT_TITLE) || defined(PROTO)
+ /*
+ * Translate a string into allocated memory, replacing special chars with
+ * printable chars. Returns NULL when out of memory.
+--- 317,324 ----
+ }
+ }
+
+! #if defined(FEAT_EVAL) || defined(FEAT_TITLE) || defined(FEAT_INS_EXPAND) \
+! || defined(PROTO)
+ /*
+ * Translate a string into allocated memory, replacing special chars with
+ * printable chars. Returns NULL when out of memory.
+*** ../vim-7.0.222/src/popupmnu.c Tue Aug 22 21:51:18 2006
+--- src/popupmnu.c Sat Mar 24 21:07:39 2007
+***************
+*** 280,287 ****
+ w = ptr2cells(p);
+ if (*p == NUL || *p == TAB || totwidth + w > pum_width)
+ {
+! /* Display the text that fits or comes before a Tab. */
+! screen_puts_len(s, (int)(p - s), row, col, attr);
+ col += width;
+
+ if (*p != TAB)
+--- 280,299 ----
+ w = ptr2cells(p);
+ if (*p == NUL || *p == TAB || totwidth + w > pum_width)
+ {
+! /* Display the text that fits or comes before a Tab.
+! * First convert it to printable characters. */
+! char_u *st;
+! int saved = *p;
+!
+! *p = NUL;
+! st = transstr(s);
+! *p = saved;
+! if (st != NULL)
+! {
+! screen_puts_len(st, (int)STRLEN(st), row, col,
+! attr);
+! vim_free(st);
+! }
+ col += width;
+
+ if (*p != TAB)
+*** ../vim-7.0.222/src/version.c Tue Mar 27 11:00:43 2007
+--- src/version.c Tue Mar 27 12:42:15 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 223,
+ /**/
+
+--
+Violators can be fined, arrested or jailed for making ugly faces at a dog.
+ [real standing law in Oklahoma, United States of America]
+
+ /// Bram Moolenaar -- Bram at 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 ///
+To: vim-dev at vim.org
+Subject: patch 7.0.224
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.224
+Problem: When expanding "##" spaces are escaped twice. (Pavol Juhas)
+Solution: Don't escape the spaces that separate arguments.
+Files: src/eval.c, src/ex_docmd.c, src/proto/ex_docmd.pro
+
+
+*** ../vim-7.0.223/src/eval.c Tue Mar 27 10:20:59 2007
+--- src/eval.c Tue Mar 27 16:47:56 2007
+***************
+*** 8924,8930 ****
+ if (*s == '%' || *s == '#' || *s == '<')
+ {
+ ++emsg_off;
+! rettv->vval.v_string = eval_vars(s, &len, NULL, &errormsg, s);
+ --emsg_off;
+ }
+ else
+--- 8924,8930 ----
+ if (*s == '%' || *s == '#' || *s == '<')
+ {
+ ++emsg_off;
+! rettv->vval.v_string = eval_vars(s, s, &len, NULL, &errormsg, NULL);
+ --emsg_off;
+ }
+ else
+*** ../vim-7.0.223/src/ex_docmd.c Sun Mar 11 15:53:27 2007
+--- src/ex_docmd.c Tue Mar 27 16:49:06 2007
+***************
+*** 4176,4181 ****
+--- 4177,4183 ----
+ int srclen;
+ char_u *p;
+ int n;
++ int escaped;
+
+ #ifdef FEAT_QUICKFIX
+ /* Skip a regexp pattern for ":vimgrep[add] pat file..." */
+***************
+*** 4216,4222 ****
+ /*
+ * Try to find a match at this position.
+ */
+! repl = eval_vars(p, &srclen, &(eap->do_ecmd_lnum), errormsgp, eap->arg);
+ if (*errormsgp != NULL) /* error detected */
+ return FAIL;
+ if (repl == NULL) /* no match found */
+--- 4218,4225 ----
+ /*
+ * Try to find a match at this position.
+ */
+! repl = eval_vars(p, eap->arg, &srclen, &(eap->do_ecmd_lnum),
+! errormsgp, &escaped);
+ if (*errormsgp != NULL) /* error detected */
+ return FAIL;
+ if (repl == NULL) /* no match found */
+***************
+*** 4235,4245 ****
+ vim_free(l);
+ }
+
+! /* Need to escape white space et al. with a backslash. Don't do this
+! * for shell commands (may have to use quotes instead). Don't do this
+! * for non-unix systems when there is a single argument (spaces don't
+! * separate arguments then). */
+ if (!eap->usefilter
+ && eap->cmdidx != CMD_bang
+ && eap->cmdidx != CMD_make
+ && eap->cmdidx != CMD_lmake
+--- 4238,4252 ----
+ vim_free(l);
+ }
+
+! /* Need to escape white space et al. with a backslash.
+! * Don't do this for:
+! * - replacement that already has been escaped: "##"
+! * - shell commands (may have to use quotes instead).
+! * - non-unix systems when there is a single argument (spaces don't
+! * separate arguments then).
+! */
+ if (!eap->usefilter
++ && !escaped
+ && eap->cmdidx != CMD_bang
+ && eap->cmdidx != CMD_make
+ && eap->cmdidx != CMD_lmake
+***************
+*** 9280,9291 ****
+ * number of characters to skip.
+ */
+ char_u *
+! eval_vars(src, usedlen, lnump, errormsg, srcstart)
+ char_u *src; /* pointer into commandline */
+ int *usedlen; /* characters after src that are used */
+ linenr_T *lnump; /* line number for :e command, or NULL */
+ char_u **errormsg; /* pointer to error message */
+! char_u *srcstart; /* beginning of valid memory for src */
+ {
+ int i;
+ char_u *s;
+--- 9289,9302 ----
+ * number of characters to skip.
+ */
+ char_u *
+! eval_vars(src, srcstart, usedlen, lnump, errormsg, escaped)
+ char_u *src; /* pointer into commandline */
++ char_u *srcstart; /* beginning of valid memory for src */
+ int *usedlen; /* characters after src that are used */
+ linenr_T *lnump; /* line number for :e command, or NULL */
+ char_u **errormsg; /* pointer to error message */
+! int *escaped; /* return value has escaped white space (can
+! * be NULL) */
+ {
+ int i;
+ char_u *s;
+***************
+*** 9332,9337 ****
+--- 9343,9350 ----
+ #endif
+
+ *errormsg = NULL;
++ if (escaped != NULL)
++ *escaped = FALSE;
+
+ /*
+ * Check if there is something to do.
+***************
+*** 9407,9412 ****
+--- 9420,9427 ----
+ result = arg_all();
+ resultbuf = result;
+ *usedlen = 2;
++ if (escaped != NULL)
++ *escaped = TRUE;
+ #ifdef FEAT_MODIFY_FNAME
+ skip_mod = TRUE;
+ #endif
+***************
+*** 9627,9633 ****
+ else
+ {
+ /* replace "<sfile>" with the sourced file name, and do ":" stuff */
+! repl = eval_vars(p, &srclen, NULL, &errormsg, result);
+ if (errormsg != NULL)
+ {
+ if (*errormsg)
+--- 9642,9648 ----
+ else
+ {
+ /* replace "<sfile>" with the sourced file name, and do ":" stuff */
+! repl = eval_vars(p, result, &srclen, NULL, &errormsg, NULL);
+ if (errormsg != NULL)
+ {
+ if (*errormsg)
+*** ../vim-7.0.223/src/proto/ex_docmd.pro Fri Mar 24 23:02:09 2006
+--- src/proto/ex_docmd.pro Tue Mar 27 16:50:04 2007
+***************
+*** 44,50 ****
+ extern FILE *open_exfile __ARGS((char_u *fname, int forceit, char *mode));
+ extern void update_topline_cursor __ARGS((void));
+ extern void exec_normal_cmd __ARGS((char_u *cmd, int remap, int silent));
+! extern char_u *eval_vars __ARGS((char_u *src, int *usedlen, linenr_T *lnump, char_u **errormsg, char_u *srcstart));
+ extern char_u *expand_sfile __ARGS((char_u *arg));
+ extern int put_eol __ARGS((FILE *fd));
+ extern int put_line __ARGS((FILE *fd, char *s));
+--- 44,50 ----
+ extern FILE *open_exfile __ARGS((char_u *fname, int forceit, char *mode));
+ extern void update_topline_cursor __ARGS((void));
+ extern void exec_normal_cmd __ARGS((char_u *cmd, int remap, int silent));
+! extern char_u *eval_vars __ARGS((char_u *src, char_u *srcstart, int *usedlen, linenr_T *lnump, char_u **errormsg, int *escaped));
+ extern char_u *expand_sfile __ARGS((char_u *arg));
+ extern int put_eol __ARGS((FILE *fd));
+ extern int put_line __ARGS((FILE *fd, char *s));
+*** ../vim-7.0.223/src/version.c Tue Mar 27 12:43:30 2007
+--- src/version.c Tue Mar 27 16:55:21 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 224,
+ /**/
+
+--
+"Software is like sex... it's better when it's free."
+ -- Linus Torvalds, initiator of the free Linux OS
+Makes me wonder what FSF stands for...?
+
+ /// Bram Moolenaar -- Bram at 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 ///
Index: arch/build/base/vim/runtime.tar.gz
<<Binary file>>
More information about the arch-commits
mailing list