packages: vim/vim.spec, vim/7.2.423 (NEW), vim/7.2.424 (NEW), vim/7.2.425 (...
arekm
arekm at pld-linux.org
Mon May 17 17:02:07 CEST 2010
Author: arekm Date: Mon May 17 15:02:07 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 7.2.436
---- Files affected:
packages/vim:
vim.spec (1.509 -> 1.510) , 7.2.423 (NONE -> 1.1) (NEW), 7.2.424 (NONE -> 1.1) (NEW), 7.2.425 (NONE -> 1.1) (NEW), 7.2.426 (NONE -> 1.1) (NEW), 7.2.427 (NONE -> 1.1) (NEW), 7.2.428 (NONE -> 1.1) (NEW), 7.2.429 (NONE -> 1.1) (NEW), 7.2.430 (NONE -> 1.1) (NEW), 7.2.431 (NONE -> 1.1) (NEW), 7.2.432 (NONE -> 1.1) (NEW), 7.2.433 (NONE -> 1.1) (NEW), 7.2.434 (NONE -> 1.1) (NEW), 7.2.435 (NONE -> 1.1) (NEW), 7.2.436 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.509 packages/vim/vim.spec:1.510
--- packages/vim/vim.spec:1.509 Thu May 13 20:37:45 2010
+++ packages/vim/vim.spec Mon May 17 17:01:59 2010
@@ -28,7 +28,7 @@
# wget -q -O - ftp://ftp.vim.org/pub/editors/vim/patches/7.2/MD5SUMS|grep -vF .gz|tail -n1|awk '{print $2}'
%define ver 7.2
-%define patchlevel 422
+%define patchlevel 436
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
Summary(es.UTF-8): Editor visual incrementado
@@ -1375,6 +1375,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.510 2010/05/17 15:01:59 arekm
+- up to 7.2.436
+
Revision 1.509 2010/05/13 18:37:45 arekm
- up to 7.2.422
================================================================
Index: packages/vim/7.2.423
diff -u /dev/null packages/vim/7.2.423:1.1
--- /dev/null Mon May 17 17:02:07 2010
+++ packages/vim/7.2.423 Mon May 17 17:01:59 2010
@@ -0,0 +1,150 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.423
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.423
+Problem: Crash when assigning s: to variable. (Yukihiro Nakadaira)
+Solution: Make ga_scripts contain pointer to scriptvar_T instead of
+ scriptvar_T itself. (Dominique Pelle)
+Files: src/eval.c
+
+
+*** ../vim-7.2.422/src/eval.c 2010-03-17 19:53:44.000000000 +0100
+--- src/eval.c 2010-05-14 12:02:16.000000000 +0200
+***************
+*** 145,153 ****
+ dict_T sv_dict;
+ } scriptvar_T;
+
+! static garray_T ga_scripts = {0, 0, sizeof(scriptvar_T), 4, NULL};
+! #define SCRIPT_SV(id) (((scriptvar_T *)ga_scripts.ga_data)[(id) - 1])
+! #define SCRIPT_VARS(id) (SCRIPT_SV(id).sv_dict.dv_hashtab)
+
+ static int echo_attr = 0; /* attributes used for ":echo" */
+
+--- 145,153 ----
+ dict_T sv_dict;
+ } scriptvar_T;
+
+! static garray_T ga_scripts = {0, 0, sizeof(scriptvar_T *), 4, NULL};
+! #define SCRIPT_SV(id) (((scriptvar_T **)ga_scripts.ga_data)[(id) - 1])
+! #define SCRIPT_VARS(id) (SCRIPT_SV(id)->sv_dict.dv_hashtab)
+
+ static int echo_attr = 0; /* attributes used for ":echo" */
+
+***************
+*** 866,875 ****
+ hash_init(&vimvarht); /* garbage_collect() will access it */
+ hash_clear(&compat_hashtab);
+
+- /* script-local variables */
+- for (i = 1; i <= ga_scripts.ga_len; ++i)
+- vars_clear(&SCRIPT_VARS(i));
+- ga_clear(&ga_scripts);
+ free_scriptnames();
+
+ /* global variables */
+--- 866,871 ----
+***************
+*** 878,883 ****
+--- 874,887 ----
+ /* autoloaded script names */
+ ga_clear_strings(&ga_loaded);
+
++ /* script-local variables */
++ for (i = 1; i <= ga_scripts.ga_len; ++i)
++ {
++ vars_clear(&SCRIPT_VARS(i));
++ vim_free(SCRIPT_SV(i));
++ }
++ ga_clear(&ga_scripts);
++
+ /* unreferenced lists and dicts */
+ (void)garbage_collect();
+
+***************
+*** 18803,18809 ****
+ /* Must be something like "s:", otherwise "ht" would be NULL. */
+ switch (varname[-2])
+ {
+! case 's': return &SCRIPT_SV(current_SID).sv_var;
+ case 'g': return &globvars_var;
+ case 'v': return &vimvars_var;
+ case 'b': return &curbuf->b_bufvar;
+--- 18807,18813 ----
+ /* Must be something like "s:", otherwise "ht" would be NULL. */
+ switch (varname[-2])
+ {
+! case 's': return &SCRIPT_SV(current_SID)->sv_var;
+ case 'g': return &globvars_var;
+ case 'v': return &vimvars_var;
+ case 'b': return &curbuf->b_bufvar;
+***************
+*** 18928,18940 ****
+ ht = &SCRIPT_VARS(i);
+ if (ht->ht_mask == HT_INIT_SIZE - 1)
+ ht->ht_array = ht->ht_smallarray;
+! sv = &SCRIPT_SV(i);
+ sv->sv_var.di_tv.vval.v_dict = &sv->sv_dict;
+ }
+
+ while (ga_scripts.ga_len < id)
+ {
+! sv = &SCRIPT_SV(ga_scripts.ga_len + 1);
+ init_var_dict(&sv->sv_dict, &sv->sv_var);
+ ++ga_scripts.ga_len;
+ }
+--- 18932,18945 ----
+ ht = &SCRIPT_VARS(i);
+ if (ht->ht_mask == HT_INIT_SIZE - 1)
+ ht->ht_array = ht->ht_smallarray;
+! sv = SCRIPT_SV(i);
+ sv->sv_var.di_tv.vval.v_dict = &sv->sv_dict;
+ }
+
+ while (ga_scripts.ga_len < id)
+ {
+! sv = SCRIPT_SV(ga_scripts.ga_len + 1) =
+! (scriptvar_T *)alloc_clear(sizeof(scriptvar_T));
+ init_var_dict(&sv->sv_dict, &sv->sv_var);
+ ++ga_scripts.ga_len;
+ }
+***************
+*** 21931,21937 ****
+ if (find_viminfo_parameter('!') == NULL)
+ return;
+
+! fprintf(fp, _("\n# global variables:\n"));
+
+ todo = (int)globvarht.ht_used;
+ for (hi = globvarht.ht_array; todo > 0; ++hi)
+--- 21936,21942 ----
+ if (find_viminfo_parameter('!') == NULL)
+ return;
+
+! fputs(_("\n# global variables:\n"), fp);
+
+ todo = (int)globvarht.ht_used;
+ for (hi = globvarht.ht_array; todo > 0; ++hi)
+*** ../vim-7.2.422/src/version.c 2010-05-13 17:46:53.000000000 +0200
+--- src/version.c 2010-05-14 12:13:19.000000000 +0200
+***************
+*** 683,684 ****
+--- 683,686 ----
+ { /* Add new patch number below this line */
++ /**/
++ 423,
+ /**/
+
+--
+He who laughs last, thinks slowest.
+
+ /// 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: packages/vim/7.2.424
diff -u /dev/null packages/vim/7.2.424:1.1
--- /dev/null Mon May 17 17:02:07 2010
+++ packages/vim/7.2.424 Mon May 17 17:01:59 2010
@@ -0,0 +1,162 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.424
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.424
+Problem: ":colorscheme" without an argument doesn't do anything.
+Solution: Make it echo the current color scheme name. (partly by Christian
+ Brabandt)
+Files: runtime/doc/syntax.txt, src/ex_cmds.h, src/ex_docmd.c
+
+
+*** ../vim-7.2.423/runtime/doc/syntax.txt 2008-08-09 19:36:52.000000000 +0200
+--- runtime/doc/syntax.txt 2010-05-14 15:27:47.000000000 +0200
+***************
+*** 113,118 ****
+--- 113,121 ----
+ :syntax off $VIMRUNTIME/syntax/nosyntax.vim
+ Also see |syntax-loading|.
+
++ NOTE: If displaying long lines is slow and switching off syntax highlighting
++ makes it fast, consider setting the 'synmaxcol' option to a lower value.
++
+ ==============================================================================
+ 2. Syntax files *:syn-files*
+
+***************
+*** 3829,3841 ****
+ in their own color.
+
+ *:colo* *:colorscheme* *E185*
+ :colo[rscheme] {name} Load color scheme {name}. This searches 'runtimepath'
+ for the file "colors/{name}.vim. The first one that
+ is found is loaded.
+! To see the name of the currently active color scheme
+! (if there is one): >
+! :echo g:colors_name
+! < Doesn't work recursively, thus you can't use
+ ":colorscheme" in a color scheme script.
+ After the color scheme has been loaded the
+ |ColorScheme| autocommand event is triggered.
+--- 3871,3890 ----
+ in their own color.
+
+ *:colo* *:colorscheme* *E185*
++ :colo[rscheme] Output the name of the currently active color scheme.
++ This is basically the same as >
++ :echo g:colors_name
++ < In case g:colors_name has not been defined :colo will
++ output "default". When compiled without the |+eval|
++ feature it will output "unknown".
++
+ :colo[rscheme] {name} Load color scheme {name}. This searches 'runtimepath'
+ for the file "colors/{name}.vim. The first one that
+ is found is loaded.
+! To see the name of the currently active color scheme: >
+! :colo
+! < The name is also stored in the g:colors_name variable.
+! Doesn't work recursively, thus you can't use
+ ":colorscheme" in a color scheme script.
+ After the color scheme has been loaded the
+ |ColorScheme| autocommand event is triggered.
+***************
+*** 4032,4038 ****
+ colors.
+ When a colorscheme is being used, changing 'background' causes it to
+ be reloaded, which may reset all colors (including Normal). First
+! delete the "colors_name" variable when you don't want this.
+
+ When you have set "ctermfg" or "ctermbg" for the Normal group, Vim
+ needs to reset the color when exiting. This is done with the "op"
+--- 4081,4087 ----
+ colors.
+ When a colorscheme is being used, changing 'background' causes it to
+ be reloaded, which may reset all colors (including Normal). First
+! delete the "g:colors_name" variable when you don't want this.
+
+ When you have set "ctermfg" or "ctermbg" for the Normal group, Vim
+ needs to reset the color when exiting. This is done with the "op"
+*** ../vim-7.2.423/src/ex_cmds.h 2010-05-13 16:46:16.000000000 +0200
+--- src/ex_cmds.h 2010-05-14 13:08:45.000000000 +0200
+***************
+*** 256,262 ****
+ EX(CMD_colder, "colder", qf_age,
+ RANGE|NOTADR|COUNT|TRLBAR),
+ EX(CMD_colorscheme, "colorscheme", ex_colorscheme,
+! NEEDARG|WORD1|TRLBAR|CMDWIN),
+ EX(CMD_command, "command", ex_command,
+ EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN),
+ EX(CMD_comclear, "comclear", ex_comclear,
+--- 256,262 ----
+ EX(CMD_colder, "colder", qf_age,
+ RANGE|NOTADR|COUNT|TRLBAR),
+ EX(CMD_colorscheme, "colorscheme", ex_colorscheme,
+! WORD1|TRLBAR|CMDWIN),
+ EX(CMD_command, "command", ex_command,
+ EXTRA|BANG|NOTRLCOM|USECTRLV|CMDWIN),
+ EX(CMD_comclear, "comclear", ex_comclear,
+*** ../vim-7.2.423/src/ex_docmd.c 2010-03-02 15:55:51.000000000 +0100
+--- src/ex_docmd.c 2010-05-14 15:26:14.000000000 +0200
+***************
+*** 6226,6232 ****
+ ex_colorscheme(eap)
+ exarg_T *eap;
+ {
+! if (load_colors(eap->arg) == FAIL)
+ EMSG2(_("E185: Cannot find color scheme %s"), eap->arg);
+ }
+
+--- 6226,6256 ----
+ ex_colorscheme(eap)
+ exarg_T *eap;
+ {
+! if (*eap->arg == NUL)
+! {
+! #ifdef FEAT_EVAL
+! char_u *expr = vim_strsave((char_u *)"g:colors_name");
+! char_u *p = NULL;
+!
+! if (expr != NULL)
+! {
+! ++emsg_off;
+! p = eval_to_string(expr, NULL, FALSE);
+! --emsg_off;
+! vim_free(expr);
+! }
+! if (p != NULL)
+! {
+! MSG(p);
+! vim_free(p);
+! }
+! else
+! MSG("default");
+! #else
+! MSG(_("unknown"));
+! #endif
+! }
+! else if (load_colors(eap->arg) == FAIL)
+ EMSG2(_("E185: Cannot find color scheme %s"), eap->arg);
+ }
+
+*** ../vim-7.2.423/src/version.c 2010-05-14 12:16:19.000000000 +0200
+--- src/version.c 2010-05-14 15:23:20.000000000 +0200
+***************
+*** 683,684 ****
+--- 683,686 ----
+ { /* Add new patch number below this line */
++ /**/
++ 424,
+ /**/
+
+--
+Everyone has a photographic memory. Some don't have film.
+
+ /// 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: packages/vim/7.2.425
diff -u /dev/null packages/vim/7.2.425:1.1
--- /dev/null Mon May 17 17:02:07 2010
+++ packages/vim/7.2.425 Mon May 17 17:01:59 2010
@@ -0,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.425
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.425
+Problem: Some compilers complain about fourth EX() argument.
+Solution: Add cast to long_u.
+Files: src/ex_cmds.h
+
+
+*** ../vim-7.2.424/src/ex_cmds.h 2010-05-14 15:28:37.000000000 +0200
+--- src/ex_cmds.h 2010-05-14 13:08:45.000000000 +0200
+***************
+*** 74,80 ****
+ # undef EX /* just in case */
+ #endif
+ #ifdef DO_DECLARE_EXCMD
+! # define EX(a, b, c, d) {(char_u *)b, c, d}
+
+ typedef void (*ex_func_T) __ARGS((exarg_T *eap));
+
+--- 74,80 ----
+ # undef EX /* just in case */
+ #endif
+ #ifdef DO_DECLARE_EXCMD
+! # define EX(a, b, c, d) {(char_u *)b, c, (long_u)(d)}
+
+ typedef void (*ex_func_T) __ARGS((exarg_T *eap));
+
+*** ../vim-7.2.424/src/version.c 2010-05-14 15:28:37.000000000 +0200
+--- src/version.c 2010-05-14 15:42:23.000000000 +0200
+***************
+*** 683,684 ****
+--- 683,686 ----
+ { /* Add new patch number below this line */
++ /**/
++ 425,
+ /**/
+
+--
+The users that I support would double-click on a landmine to find out
+what happens. -- A system administrator
+
+ /// 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: packages/vim/7.2.426
diff -u /dev/null packages/vim/7.2.426:1.1
--- /dev/null Mon May 17 17:02:07 2010
+++ packages/vim/7.2.426 Mon May 17 17:01:59 2010
@@ -0,0 +1,136 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.426
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.426
+Problem: Commas in 'langmap' are not always handled correctly.
+Solution: Require commas to be backslash escaped. (James Vega)
+Files: src/option.c
+
+
+*** ../vim-7.2.425/src/option.c 2010-05-13 13:12:01.000000000 +0200
+--- src/option.c 2010-05-14 16:04:21.000000000 +0200
+***************
+*** 10432,10437 ****
+--- 10432,10442 ----
+ p2 = NULL; /* aAbBcCdD form, p2 is NULL */
+ while (p[0])
+ {
++ if (p[0] == ',')
++ {
++ ++p;
++ break;
++ }
+ if (p[0] == '\\' && p[1] != NUL)
+ ++p;
+ #ifdef FEAT_MBYTE
+***************
+*** 10439,10464 ****
+ #else
+ from = p[0];
+ #endif
+ if (p2 == NULL)
+ {
+ mb_ptr_adv(p);
+! if (p[0] == '\\')
+! ++p;
+ #ifdef FEAT_MBYTE
+! to = (*mb_ptr2char)(p);
+ #else
+! to = p[0];
+ #endif
+ }
+ else
+ {
+! if (p2[0] == '\\')
+! ++p2;
+ #ifdef FEAT_MBYTE
+! to = (*mb_ptr2char)(p2);
+ #else
+! to = p2[0];
+ #endif
+ }
+ if (to == NUL)
+ {
+--- 10444,10476 ----
+ #else
+ from = p[0];
+ #endif
++ to = NUL;
+ if (p2 == NULL)
+ {
+ mb_ptr_adv(p);
+! if (p[0] != ',')
+! {
+! if (p[0] == '\\')
+! ++p;
+ #ifdef FEAT_MBYTE
+! to = (*mb_ptr2char)(p);
+ #else
+! to = p[0];
+ #endif
++ }
+ }
+ else
+ {
+! if (p2[0] != ',')
+! {
+! if (p2[0] == '\\')
+! ++p2;
+ #ifdef FEAT_MBYTE
+! to = (*mb_ptr2char)(p2);
+ #else
+! to = p2[0];
+ #endif
++ }
+ }
+ if (to == NUL)
+ {
+***************
+*** 10476,10490 ****
+
+ /* Advance to next pair */
+ mb_ptr_adv(p);
+! if (p2 == NULL)
+! {
+! if (p[0] == ',')
+! {
+! ++p;
+! break;
+! }
+! }
+! else
+ {
+ mb_ptr_adv(p2);
+ if (*p == ';')
+--- 10488,10494 ----
+
+ /* Advance to next pair */
+ mb_ptr_adv(p);
+! if (p2 != NULL)
+ {
+ mb_ptr_adv(p2);
+ if (*p == ';')
+*** ../vim-7.2.425/src/version.c 2010-05-14 15:42:49.000000000 +0200
+--- src/version.c 2010-05-14 17:32:11.000000000 +0200
+***************
+*** 683,684 ****
+--- 683,686 ----
+ { /* Add new patch number below this line */
++ /**/
++ 426,
+ /**/
+
+--
+On the other hand, you have different fingers.
+ -- Steven Wright
+
+ /// 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: packages/vim/7.2.427
diff -u /dev/null packages/vim/7.2.427:1.1
--- /dev/null Mon May 17 17:02:07 2010
+++ packages/vim/7.2.427 Mon May 17 17:01:59 2010
@@ -0,0 +1,207 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.427
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.427
+Problem: The swapfile is created using the destination of a symlink, but
+ recovery doesn't follow symlinks.
+Solution: When recovering, resolve symlinks. (James Vega)
+Files: src/memline.c
+
+
+*** ../vim-7.2.426/src/memline.c 2010-03-10 14:46:21.000000000 +0100
+--- src/memline.c 2010-05-14 17:28:29.000000000 +0200
+***************
+*** 245,250 ****
+--- 245,253 ----
+ #ifdef FEAT_BYTEOFF
+ static void ml_updatechunk __ARGS((buf_T *buf, long line, long len, int updtype));
+ #endif
++ #ifdef HAVE_READLINK
++ static int resolve_symlink __ARGS((char_u *fname, char_u *buf));
++ #endif
+
+ /*
+ * Open a new memline for "buf".
+***************
+*** 1401,1410 ****
+ int i;
+ char_u *dirp;
+ char_u *dir_name;
+
+ if (list)
+ {
+! /* use msg() to start the scrolling properly */
+ msg((char_u *)_("Swap files found:"));
+ msg_putchar('\n');
+ }
+--- 1404,1422 ----
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.509&r2=1.510&f=u
More information about the pld-cvs-commit
mailing list