r722 - in /trunk/packages/vim: debian/README debian/changelog
patches/edit.c.diff patches/series upstream/patches/7.0.022
upstream/patches/7.0.023 upstream/patches/7.0.024 upstream/patches/7.0.025
upstream/patches/7.0.026
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Thu Jun 22 16:37:15 UTC 2006
Author: zack
Date: Thu Jun 22 16:37:12 2006
New Revision: 722
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=722
Log:
added upstream patches 22-26
removed no longer needed patch 023
Added:
trunk/packages/vim/upstream/patches/7.0.022
trunk/packages/vim/upstream/patches/7.0.023
trunk/packages/vim/upstream/patches/7.0.024
trunk/packages/vim/upstream/patches/7.0.025
trunk/packages/vim/upstream/patches/7.0.026
Removed:
trunk/packages/vim/patches/edit.c.diff
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/patches/series
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=722&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Thu Jun 22 16:37:12 2006
@@ -46,3 +46,8 @@
1425 7.0.019 crash for "VjA789" and repeating
1470 7.0.020 GUI: crash when using 'mousefocus'
4240 7.0.021 crash when using "\\[" and "\\]" in 'errorformat
+ 5471 7.0.022 Using buffer.append() in Ruby may append to the wrong buffer
+ 5351 7.0.023 Crash when doing spell completion in an empty line + CTRL-E
+ 1619 7.0.024 It is possible to set arbitrary "v:" variables
+ 2606 7.0.025 Crash when removing an element of a:000
+ 1800 7.0.026 Using libcall() may show an old error
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=722&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Thu Jun 22 16:37:12 2006
@@ -1,10 +1,13 @@
vim (1:7.0-021+1) unstable; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (018 - 021), see README.gz for details.
+ * New upstream patches (018 - 026), see README.gz for details.
[ James Vega ]
* debian/control: Make Vim binNMUable.
+
+ [ Stefano Zacchiroli ]
+ * Removed patch edit.c.diff, no longer needed after upstream patch 023
-- James Vega <jamessan at debian.org> Mon, 19 Jun 2006 10:55:13 -0400
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=722&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Thu Jun 22 16:37:12 2006
@@ -1,6 +1,5 @@
xdefaults.vim.diff -p0
debcontrol.vim.diff -p0
-edit.c.diff -p0
po.vim.diff -p0
python.vim-ftplugin_include.diff -p0
mysql.vim-syntax_comment.diff -p0
Added: trunk/packages/vim/upstream/patches/7.0.022
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.022?rev=722&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.022 (added)
+++ trunk/packages/vim/upstream/patches/7.0.022 Thu Jun 22 16:37:12 2006
@@ -1,0 +1,234 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.022
+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.022
+Problem: Using buffer.append() in Ruby may append the line to the wrong
+ buffer. (Alex Norman)
+Solution: Properly switch to the buffer to do the appending. Also for
+ buffer.delete() and setting a buffer line.
+Files: src/if_ruby.c
+
+
+*** ../vim-7.0.021/src/if_ruby.c Sun Apr 30 20:25:42 2006
+--- src/if_ruby.c Tue Jun 20 21:01:23 2006
+***************
+*** 643,653 ****
+
+ static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
+ {
+! buf_T *savebuf = curbuf;
+! char *line = STR2CSTR(str);
+
+! if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
+ curbuf = buf;
+ if (u_savesub(n) == OK) {
+ ml_replace(n, (char_u *)line, TRUE);
+ changed();
+--- 643,665 ----
+
+ static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
+ {
+! char *line = STR2CSTR(str);
+! #ifdef FEAT_AUTOCMD
+! aco_save_T aco;
+! #else
+! buf_T *save_curbuf = curbuf;
+! #endif
+
+! if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL)
+! {
+! #ifdef FEAT_AUTOCMD
+! /* set curwin/curbuf for "buf" and save some things */
+! aucmd_prepbuf(&aco, buf);
+! #else
+ curbuf = buf;
++ curwin->w_buffer = buf;
++ #endif
++
+ if (u_savesub(n) == OK) {
+ ml_replace(n, (char_u *)line, TRUE);
+ changed();
+***************
+*** 655,664 ****
+ syn_changed(n); /* recompute syntax hl. for this line */
+ #endif
+ }
+! curbuf = savebuf;
+ update_curbuf(NOT_VALID);
+ }
+! else {
+ rb_raise(rb_eIndexError, "index %d out of buffer", n);
+ return Qnil; /* For stop warning */
+ }
+--- 667,685 ----
+ syn_changed(n); /* recompute syntax hl. for this line */
+ #endif
+ }
+!
+! #ifdef FEAT_AUTOCMD
+! /* restore curwin/curbuf and a few other things */
+! aucmd_restbuf(&aco);
+! /* Careful: autocommands may have made "buf" invalid! */
+! #else
+! curwin->w_buffer = save_curbuf;
+! curbuf = save_curbuf;
+! #endif
+ update_curbuf(NOT_VALID);
+ }
+! else
+! {
+ rb_raise(rb_eIndexError, "index %d out of buffer", n);
+ return Qnil; /* For stop warning */
+ }
+***************
+*** 676,687 ****
+
+ static VALUE buffer_delete(VALUE self, VALUE num)
+ {
+! buf_T *buf = get_buf(self);
+! buf_T *savebuf = curbuf;
+! long n = NUM2LONG(num);
+
+! if (n > 0 && n <= buf->b_ml.ml_line_count) {
+ curbuf = buf;
+ if (u_savedel(n, 1) == OK) {
+ ml_delete(n, 0);
+
+--- 697,720 ----
+
+ static VALUE buffer_delete(VALUE self, VALUE num)
+ {
+! buf_T *buf = get_buf(self);
+! long n = NUM2LONG(num);
+! #ifdef FEAT_AUTOCMD
+! aco_save_T aco;
+! #else
+! buf_T *save_curbuf = curbuf;
+! #endif
+
+! if (n > 0 && n <= buf->b_ml.ml_line_count)
+! {
+! #ifdef FEAT_AUTOCMD
+! /* set curwin/curbuf for "buf" and save some things */
+! aucmd_prepbuf(&aco, buf);
+! #else
+ curbuf = buf;
++ curwin->w_buffer = buf;
++ #endif
++
+ if (u_savedel(n, 1) == OK) {
+ ml_delete(n, 0);
+
+***************
+*** 691,700 ****
+
+ changed();
+ }
+! curbuf = savebuf;
+ update_curbuf(NOT_VALID);
+ }
+! else {
+ rb_raise(rb_eIndexError, "index %d out of buffer", n);
+ }
+ return Qnil;
+--- 724,742 ----
+
+ changed();
+ }
+!
+! #ifdef FEAT_AUTOCMD
+! /* restore curwin/curbuf and a few other things */
+! aucmd_restbuf(&aco);
+! /* Careful: autocommands may have made "buf" invalid! */
+! #else
+! curwin->w_buffer = save_curbuf;
+! curbuf = save_curbuf;
+! #endif
+ update_curbuf(NOT_VALID);
+ }
+! else
+! {
+ rb_raise(rb_eIndexError, "index %d out of buffer", n);
+ }
+ return Qnil;
+***************
+*** 702,714 ****
+
+ static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
+ {
+! buf_T *buf = get_buf(self);
+! buf_T *savebuf = curbuf;
+! char *line = STR2CSTR(str);
+! long n = NUM2LONG(num);
+
+! if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
+ curbuf = buf;
+ if (u_inssub(n + 1) == OK) {
+ ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
+
+--- 744,768 ----
+
+ static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
+ {
+! buf_T *buf = get_buf(self);
+! char *line = STR2CSTR(str);
+! long n = NUM2LONG(num);
+! #ifdef FEAT_AUTOCMD
+! aco_save_T aco;
+! #else
+! buf_T *save_curbuf = curbuf;
+! #endif
+
+! if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL)
+! {
+! #ifdef FEAT_AUTOCMD
+! /* set curwin/curbuf for "buf" and save some things */
+! aucmd_prepbuf(&aco, buf);
+! #else
+ curbuf = buf;
++ curwin->w_buffer = buf;
++ #endif
++
+ if (u_inssub(n + 1) == OK) {
+ ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
+
+***************
+*** 718,724 ****
+
+ changed();
+ }
+! curbuf = savebuf;
+ update_curbuf(NOT_VALID);
+ }
+ else {
+--- 772,786 ----
+
+ changed();
+ }
+!
+! #ifdef FEAT_AUTOCMD
+! /* restore curwin/curbuf and a few other things */
+! aucmd_restbuf(&aco);
+! /* Careful: autocommands may have made "buf" invalid! */
+! #else
+! curwin->w_buffer = save_curbuf;
+! curbuf = save_curbuf;
+! #endif
+ update_curbuf(NOT_VALID);
+ }
+ else {
+*** ../vim-7.0.021/src/version.c Tue Jun 20 20:49:42 2006
+--- src/version.c Tue Jun 20 18:42:35 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 22,
+ /**/
Added: trunk/packages/vim/upstream/patches/7.0.023
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.023?rev=722&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.023 (added)
+++ trunk/packages/vim/upstream/patches/7.0.023 Thu Jun 22 16:37:12 2006
@@ -1,0 +1,170 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.023
+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.023
+Problem: Crash when doing spell completion in an empty line and pressing
+ CTRL-E.
+Solution: Check for a zero pointer. (James Vega)
+ Also handle a situation without a matching pattern better, report
+ "No matches" instead of remaining in undefined CTRL-X mode. And
+ get out of CTRL-X mode when typing a letter.
+Files: src/edit.c
+
+
+*** ../vim-7.0.022/src/edit.c Sat May 13 15:27:57 2006
+--- src/edit.c Thu Jun 22 16:44:01 2006
+***************
+*** 719,727 ****
+ #ifdef FEAT_INS_EXPAND
+ /*
+ * Special handling of keys while the popup menu is visible or wanted
+! * and the cursor is still in the completed word.
+ */
+! if (compl_started && pum_wanted() && curwin->w_cursor.col >= compl_col)
+ {
+ /* BS: Delete one character from "compl_leader". */
+ if ((c == K_BS || c == Ctrl_H)
+--- 721,734 ----
+ #ifdef FEAT_INS_EXPAND
+ /*
+ * Special handling of keys while the popup menu is visible or wanted
+! * and the cursor is still in the completed word. Only when there is
+! * a match, skip this when no matches were found.
+ */
+! if (compl_started
+! && pum_wanted()
+! && curwin->w_cursor.col >= compl_col
+! && (compl_shown_match == NULL
+! || compl_shown_match != compl_shown_match->cp_next))
+ {
+ /* BS: Delete one character from "compl_leader". */
+ if ((c == K_BS || c == Ctrl_H)
+***************
+*** 3393,3408 ****
+ ptr = compl_leader;
+ else
+ ptr = compl_orig_text;
+! p = compl_orig_text;
+! for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp]; ++temp)
+! ;
+ #ifdef FEAT_MBYTE
+! if (temp > 0)
+! temp -= (*mb_head_off)(compl_orig_text, p + temp);
+ #endif
+! for (p += temp; *p != NUL; mb_ptr_adv(p))
+! AppendCharToRedobuff(K_BS);
+! AppendToRedobuffLit(ptr + temp, -1);
+ }
+
+ #ifdef FEAT_CINDENT
+--- 3401,3421 ----
+ ptr = compl_leader;
+ else
+ ptr = compl_orig_text;
+! if (compl_orig_text != NULL)
+! {
+! p = compl_orig_text;
+! for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp];
+! ++temp)
+! ;
+ #ifdef FEAT_MBYTE
+! if (temp > 0)
+! temp -= (*mb_head_off)(compl_orig_text, p + temp);
+ #endif
+! for (p += temp; *p != NUL; mb_ptr_adv(p))
+! AppendCharToRedobuff(K_BS);
+! }
+! if (ptr != NULL)
+! AppendToRedobuffLit(ptr + temp, -1);
+ }
+
+ #ifdef FEAT_CINDENT
+***************
+*** 4650,4659 ****
+ (int)STRLEN(compl_pattern), curs_col);
+ if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
+ || compl_xp.xp_context == EXPAND_NOTHING)
+! return FAIL;
+! startcol = (int)(compl_xp.xp_pattern - compl_pattern);
+! compl_col = startcol;
+! compl_length = curs_col - startcol;
+ }
+ else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
+ {
+--- 4663,4680 ----
+ (int)STRLEN(compl_pattern), curs_col);
+ if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
+ || compl_xp.xp_context == EXPAND_NOTHING)
+! {
+! compl_col = curs_col;
+! compl_length = 0;
+! vim_free(compl_pattern);
+! compl_pattern = NULL;
+! }
+! else
+! {
+! startcol = (int)(compl_xp.xp_pattern - compl_pattern);
+! compl_col = startcol;
+! compl_length = curs_col - startcol;
+! }
+ }
+ else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
+ {
+***************
+*** 4707,4717 ****
+ else
+ compl_col = spell_word_start(startcol);
+ if (compl_col >= (colnr_T)startcol)
+! return FAIL;
+! spell_expand_check_cap(compl_col);
+ /* Need to obtain "line" again, it may have become invalid. */
+ line = ml_get(curwin->w_cursor.lnum);
+- compl_length = (int)curs_col - compl_col;
+ compl_pattern = vim_strnsave(line + compl_col, compl_length);
+ if (compl_pattern == NULL)
+ #endif
+--- 4728,4744 ----
+ else
+ compl_col = spell_word_start(startcol);
+ if (compl_col >= (colnr_T)startcol)
+! {
+! compl_length = 0;
+! compl_col = curs_col;
+! }
+! else
+! {
+! spell_expand_check_cap(compl_col);
+! compl_length = (int)curs_col - compl_col;
+! }
+ /* Need to obtain "line" again, it may have become invalid. */
+ line = ml_get(curwin->w_cursor.lnum);
+ compl_pattern = vim_strnsave(line + compl_col, compl_length);
+ if (compl_pattern == NULL)
+ #endif
+*** ../vim-7.0.022/src/version.c Tue Jun 20 21:08:02 2006
+--- src/version.c Thu Jun 22 16:34:42 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 23,
+ /**/
+
+--
+BEDEVERE: Look! It's the old man from scene 24 - what's he Doing here?
+ARTHUR: He is the keeper of the Bridge. He asks each traveler five
+ questions ...
+GALAHAD: Three questions.
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.0.024
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.024?rev=722&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.024 (added)
+++ trunk/packages/vim/upstream/patches/7.0.024 Thu Jun 22 16:37:12 2006
@@ -1,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.024
+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.024
+Problem: It is possible to set arbitrary "v:" variables.
+Solution: Disallow setting "v:" variables that are not predefined.
+Files: src/eval.c
+
+
+*** ../vim-7.0.023/src/eval.c Sat May 13 13:36:47 2006
+--- src/eval.c Thu Jun 22 17:27:51 2006
+***************
+*** 17759,17764 ****
+--- 17763,17775 ----
+ }
+ else /* add a new variable */
+ {
++ /* Can't add "v:" variable. */
++ if (ht == &vimvarht)
++ {
++ EMSG2(_(e_illvar), name);
++ return;
++ }
++
+ /* Make sure the variable name is valid. */
+ for (p = varname; *p != NUL; ++p)
+ if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
+*** ../vim-7.0.023/src/version.c Thu Jun 22 16:48:43 2006
+--- src/version.c Thu Jun 22 17:30:59 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 24,
+ /**/
+
+--
+ARTHUR: No, hang on! Just answer the five questions ...
+GALAHAD: Three questions ...
+ARTHUR: Three questions ... And we shall watch ... and pray.
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.0.025
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.025?rev=722&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.025 (added)
+++ trunk/packages/vim/upstream/patches/7.0.025 Thu Jun 22 16:37:12 2006
@@ -1,0 +1,80 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.025
+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.025
+Problem: Crash when removing an element of a:000. (Nikolai Weibull)
+Solution: Mark the a:000 list with VAR_FIXED.
+Files: src/eval.c
+
+
+*** ../vim-7.0.024/src/eval.c Thu Jun 22 17:33:49 2006
+--- src/eval.c Thu Jun 22 17:56:50 2006
+***************
+*** 13250,13256 ****
+ if (argvars[2].v_type != VAR_UNKNOWN)
+ EMSG2(_(e_toomanyarg), "remove()");
+ else if ((d = argvars[0].vval.v_dict) != NULL
+! && !tv_check_lock(d->dv_lock, (char_u *)"remove()"))
+ {
+ key = get_tv_string_chk(&argvars[1]);
+ if (key != NULL)
+--- 13254,13260 ----
+ if (argvars[2].v_type != VAR_UNKNOWN)
+ EMSG2(_(e_toomanyarg), "remove()");
+ else if ((d = argvars[0].vval.v_dict) != NULL
+! && !tv_check_lock(d->dv_lock, (char_u *)"remove() argument"))
+ {
+ key = get_tv_string_chk(&argvars[1]);
+ if (key != NULL)
+***************
+*** 13270,13276 ****
+ else if (argvars[0].v_type != VAR_LIST)
+ EMSG2(_(e_listdictarg), "remove()");
+ else if ((l = argvars[0].vval.v_list) != NULL
+! && !tv_check_lock(l->lv_lock, (char_u *)"remove()"))
+ {
+ int error = FALSE;
+
+--- 13274,13280 ----
+ else if (argvars[0].v_type != VAR_LIST)
+ EMSG2(_(e_listdictarg), "remove()");
+ else if ((l = argvars[0].vval.v_list) != NULL
+! && !tv_check_lock(l->lv_lock, (char_u *)"remove() argument"))
+ {
+ int error = FALSE;
+
+***************
+*** 19693,19698 ****
+--- 19697,19703 ----
+ v->di_tv.vval.v_list = &fc.l_varlist;
+ vim_memset(&fc.l_varlist, 0, sizeof(list_T));
+ fc.l_varlist.lv_refcount = 99999;
++ fc.l_varlist.lv_lock = VAR_FIXED;
+
+ /*
+ * Set a:firstline to "firstline" and a:lastline to "lastline".
+*** ../vim-7.0.024/src/version.c Thu Jun 22 17:33:49 2006
+--- src/version.c Thu Jun 22 17:59:17 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 25,
+ /**/
+
+--
+BRIDGEKEEPER: What is your favorite colour?
+GAWAIN: Blue ... No yelloooooww!
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.0.026
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.026?rev=722&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.026 (added)
+++ trunk/packages/vim/upstream/patches/7.0.026 Thu Jun 22 16:37:12 2006
@@ -1,0 +1,60 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.026
+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.026
+Problem: Using libcall() may show an old error.
+Solution: Invoke dlerror() to clear a previous error. (Yukihiro Nakadaira)
+Files: src/os_unix.c
+
+
+*** ../vim-7.0.025/src/os_unix.c Wed May 3 00:01:30 2006
+--- src/os_unix.c Sat Jun 17 21:00:14 2006
+***************
+*** 5757,5764 ****
+ int retval_int = 0;
+ int success = FALSE;
+
+! /* Get a handle to the DLL module. */
+ # if defined(USE_DLOPEN)
+ hinstLib = dlopen((char *)libname, RTLD_LAZY
+ # ifdef RTLD_LOCAL
+ | RTLD_LOCAL
+--- 5758,5770 ----
+ int retval_int = 0;
+ int success = FALSE;
+
+! /*
+! * Get a handle to the DLL module.
+! */
+ # if defined(USE_DLOPEN)
++ /* First clear any error, it's not cleared by the dlopen() call. */
++ (void)dlerror();
++
+ hinstLib = dlopen((char *)libname, RTLD_LAZY
+ # ifdef RTLD_LOCAL
+ | RTLD_LOCAL
+*** ../vim-7.0.025/src/version.c Thu Jun 22 18:02:06 2006
+--- src/version.c Thu Jun 22 18:05:10 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 26,
+ /**/
+
+--
+BRIDGEKEEPER: What is your favorite editor?
+GAWAIN: Emacs ... No, Viiiiiiiiiiimmmmmmm!
+ "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD
+
+ /// 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 ///
More information about the pkg-vim-maintainers
mailing list