r1021 - in /trunk/packages/vim: debian/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Wed Sep 19 03:21:00 UTC 2007
Author: jamessan
Date: Wed Sep 19 03:20:58 2007
New Revision: 1021
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1021
Log:
* New upstream patches (057 - 116), see README.gz for details.
Added:
trunk/packages/vim/upstream/patches/7.1.109
trunk/packages/vim/upstream/patches/7.1.110
trunk/packages/vim/upstream/patches/7.1.111
trunk/packages/vim/upstream/patches/7.1.112
trunk/packages/vim/upstream/patches/7.1.113
trunk/packages/vim/upstream/patches/7.1.114
trunk/packages/vim/upstream/patches/7.1.115
trunk/packages/vim/upstream/patches/7.1.116
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1021&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed Sep 19 03:20:58 2007
@@ -21,6 +21,11 @@
patches for binaries.
Checksums for the patch files can be found in the file MD5.
+
+Collection of patches for Vim 7.1:
+ SIZE NAME INCLUDES
+ 91424 7.1.001-100.gz patches 7.1.001 to 7.1.100, gzip'ed
+
Individual patches for Vim 7.1:
@@ -132,3 +137,11 @@
1580 7.1.106 ":messages" doesn't quit listing on ":"
4081 7.1.107 Visual block mode "s" that auto-indents fails in other lines
2633 7.1.108 (after 7.1.100) Win32: compilation problems in Cscope code
+ 2147 7.1.109 GTK GUI: click on arrow left of tab
+ 2234 7.1.110 (after 7.1.102) Win32: Still compilation problems with Perl
+ 2946 7.1.111 after ":vimgrep /pat/j *" folds can be wrong
+ 1766 7.1.112 using input() with a wrong argument may crash Vim
+ 2765 7.1.113 map() on an empty list causes memory to be freed twice
+ 1386 7.1.114 memory leak in getmatches()
+ 1472 7.1.115 (after 7.1.105) compiler warning for uninitialized variable
+ 3137 7.1.116 can't display characters above 0x10000
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1021&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Sep 19 03:20:58 2007
@@ -1,13 +1,13 @@
-vim (1:7.1-108+1) UNRELEASED; urgency=low
+vim (1:7.1-116+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (057 - 108), see README.gz for details.
+ * New upstream patches (057 - 116), see README.gz for details.
[ Stefano Zacchiroli ]
* debian/control
- removing idle contributors from the Uploaders field
- -- James Vega <jamessan at debian.org> Fri, 14 Sep 2007 18:17:25 -0400
+ -- James Vega <jamessan at debian.org> Tue, 18 Sep 2007 20:58:11 -0400
vim (1:7.1-056+2) unstable; urgency=low
Added: trunk/packages/vim/upstream/patches/7.1.109
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.109?rev=1021&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.109 (added)
+++ trunk/packages/vim/upstream/patches/7.1.109 Wed Sep 19 03:20:58 2007
@@ -1,0 +1,69 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.109
+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.1.109
+Problem: GTK: when there are many tab pages, clicking on the arrow left of
+ the labels moves to the next tab page on the right. (Simeon Bird)
+Solution: Check the X coordinate of the click and pass -1 as value for the
+ left arrow.
+Files: src/gui_gtk_x11.c, src/term.c
+
+
+*** ../vim-7.1.108/src/gui_gtk_x11.c Wed Sep 5 21:45:54 2007
+--- src/gui_gtk_x11.c Fri Sep 14 20:59:55 2007
+***************
+*** 3223,3230 ****
+ {
+ if (clicked_page == 0)
+ {
+! /* Click after all tabs moves to next tab page. */
+! if (send_tabline_event(0) && gtk_main_level() > 0)
+ gtk_main_quit();
+ }
+ #ifndef HAVE_GTK2
+--- 3223,3231 ----
+ {
+ if (clicked_page == 0)
+ {
+! /* Click after all tabs moves to next tab page. When "x" is
+! * small guess it's the left button. */
+! if (send_tabline_event(x < 50 ? -1 : 0) && gtk_main_level() > 0)
+ gtk_main_quit();
+ }
+ #ifndef HAVE_GTK2
+*** ../vim-7.1.108/src/term.c Thu May 10 20:48:32 2007
+--- src/term.c Fri Sep 14 20:56:40 2007
+***************
+*** 4809,4814 ****
+--- 4809,4816 ----
+ if (num_bytes == -1)
+ return -1;
+ current_tab = (int)bytes[0];
++ if (current_tab == 255) /* -1 in a byte gives 255 */
++ current_tab = -1;
+ slen += num_bytes;
+ }
+ else if (key_name[0] == (int)KS_TABMENU)
+*** ../vim-7.1.108/src/version.c Fri Sep 14 19:56:18 2007
+--- src/version.c Sat Sep 15 14:05:25 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 109,
+ /**/
+
+--
+No letters of the alphabet were harmed in the creation of this message.
+
+ /// 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.1.110
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.110?rev=1021&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.110 (added)
+++ trunk/packages/vim/upstream/patches/7.1.110 Wed Sep 19 03:20:58 2007
@@ -1,0 +1,66 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.110
+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.1.110 (after 7.1.102)
+Problem: Win32: Still compilation problems with Perl.
+Solution: Change the #ifdefs. (Suresh Govindachar)
+Files: src/if_perl.xs
+
+
+*** ../vim-7.1.109/src/if_perl.xs Thu Sep 13 15:19:32 2007
+--- src/if_perl.xs Fri Sep 14 21:23:38 2007
+***************
+*** 48,60 ****
+ * The changes include addition of two symbols (Perl_sv_2iv_flags,
+ * Perl_newXS_flags) not present in earlier releases.
+ *
+! * Jan Dubois suggested the following guarding scheme:
+ */
+! #if (ACTIVEPERL_VERSION >= 822)
+! # define PERL589_OR_LATER
+! #endif
+! #if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 9)
+! # define PERL589_OR_LATER
+ #endif
+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
+ # define PERL589_OR_LATER
+--- 48,62 ----
+ * The changes include addition of two symbols (Perl_sv_2iv_flags,
+ * Perl_newXS_flags) not present in earlier releases.
+ *
+! * Jan Dubois suggested the following guarding scheme.
+! *
+! * Active State defined ACTIVEPERL_VERSION as a string in versions before
+! * 5.8.8; and so the comparison to 822 below needs to be guarded.
+ */
+! #if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 8)
+! # if (ACTIVEPERL_VERSION >= 822) || (PERL_SUBVERSION >= 9)
+! # define PERL589_OR_LATER
+! # endif
+ #endif
+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
+ # define PERL589_OR_LATER
+*** ../vim-7.1.109/src/version.c Sat Sep 15 14:06:41 2007
+--- src/version.c Sat Sep 15 14:48:05 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 110,
+ /**/
+
+--
+"It's so simple to be wise. Just think of something stupid to say
+and then don't say it." -- Sam Levenson
+
+ /// 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.1.111
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.111?rev=1021&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.111 (added)
+++ trunk/packages/vim/upstream/patches/7.1.111 Wed Sep 19 03:20:58 2007
@@ -1,0 +1,105 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.111
+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.1.111
+Problem: When using ":vimgrep" with the "j" flag folds from another buffer
+ may be displayed. (A.Politz)
+Solution: When not jumping to another buffer update the folds.
+Files: src/quickfix.c
+
+
+*** ../vim-7.1.110/src/quickfix.c Thu Jun 28 21:23:52 2007
+--- src/quickfix.c Fri Sep 14 22:16:23 2007
+***************
+*** 1612,1619 ****
+ }
+
+ /*
+! * If there is only one window and is the quickfix window, create a new
+! * one above the quickfix window.
+ */
+ if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win)
+ {
+--- 1612,1619 ----
+ }
+
+ /*
+! * If there is only one window and it is the quickfix window, create a
+! * new one above the quickfix window.
+ */
+ if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win)
+ {
+***************
+*** 2981,2986 ****
+--- 2981,2987 ----
+ buf_T *buf;
+ int duplicate_name = FALSE;
+ int using_dummy;
++ int redraw_for_dummy = FALSE;
+ int found_match;
+ buf_T *first_match_buf = NULL;
+ time_t seconds = 0;
+***************
+*** 3097,3102 ****
+--- 3098,3104 ----
+ /* Remember that a buffer with this name already exists. */
+ duplicate_name = (buf != NULL);
+ using_dummy = TRUE;
++ redraw_for_dummy = TRUE;
+
+ #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
+ /* Don't do Filetype autocommands to avoid loading syntax and
+***************
+*** 3243,3252 ****
+--- 3245,3272 ----
+ if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
+ {
+ if ((flags & VGR_NOJUMP) == 0)
++ {
++ buf = curbuf;
+ qf_jump(qi, 0, 0, eap->forceit);
++ if (buf != curbuf)
++ /* If we jumped to another buffer redrawing will already be
++ * taken care of. */
++ redraw_for_dummy = FALSE;
++ }
+ }
+ else
+ EMSG2(_(e_nomatch2), s);
++
++ /* If we loaded a dummy buffer into the current window, the autocommands
++ * may have messed up things, need to redraw and recompute folds. */
++ if (redraw_for_dummy)
++ {
++ #ifdef FEAT_FOLDING
++ foldUpdateAll(curwin);
++ #else
++ redraw_later(NOT_VALID);
++ #endif
++ }
+
+ theend:
+ vim_free(regmatch.regprog);
+*** ../vim-7.1.110/src/version.c Sat Sep 15 14:48:57 2007
+--- src/version.c Sun Sep 16 13:23:48 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 111,
+ /**/
+
+--
+Trees moving back and forth is what makes the wind blow.
+
+ /// 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.1.112
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.112?rev=1021&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.112 (added)
+++ trunk/packages/vim/upstream/patches/7.1.112 Wed Sep 19 03:20:58 2007
@@ -1,0 +1,64 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.112
+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.1.112
+Problem: Using input() with a wrong argument may crash Vim. (A.Politz)
+Solution: Init the input() return value to NULL.
+Files: src/eval.c
+
+
+*** ../vim-7.1.111/src/eval.c Thu Sep 13 20:39:58 2007
+--- src/eval.c Sat Sep 15 19:04:51 2007
+***************
+*** 11565,11578 ****
+ char_u *xp_arg = NULL;
+
+ rettv->v_type = VAR_STRING;
+
+ #ifdef NO_CONSOLE_INPUT
+ /* While starting up, there is no place to enter text. */
+ if (no_console_input())
+- {
+- rettv->vval.v_string = NULL;
+ return;
+- }
+ #endif
+
+ cmd_silent = FALSE; /* Want to see the prompt. */
+--- 11566,11577 ----
+ char_u *xp_arg = NULL;
+
+ rettv->v_type = VAR_STRING;
++ rettv->vval.v_string = NULL;
+
+ #ifdef NO_CONSOLE_INPUT
+ /* While starting up, there is no place to enter text. */
+ if (no_console_input())
+ return;
+ #endif
+
+ cmd_silent = FALSE; /* Want to see the prompt. */
+*** ../vim-7.1.111/src/version.c Sun Sep 16 13:26:56 2007
+--- src/version.c Sun Sep 16 14:19:04 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 112,
+ /**/
+
+--
+The early bird gets the worm. If you want something else for
+breakfast, get up later.
+
+ /// 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.1.113
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.113?rev=1021&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.113 (added)
+++ trunk/packages/vim/upstream/patches/7.1.113 Wed Sep 19 03:20:58 2007
@@ -1,0 +1,114 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.113
+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.1.113
+Problem: Using map() to go over an empty list causes memory to be freed
+ twice. (A.Politz)
+Solution: Don't clear the typeval in restore_vimvar().
+Files: src/eval.c
+
+
+*** ../vim-7.1.112/src/eval.c Sun Sep 16 14:20:18 2007
+--- src/eval.c Sun Sep 16 19:24:49 2007
+***************
+*** 1318,1324 ****
+ {
+ hashitem_T *hi;
+
+- clear_tv(&vimvars[idx].vv_tv);
+ vimvars[idx].vv_tv = *save_tv;
+ if (vimvars[idx].vv_type == VAR_UNKNOWN)
+ {
+--- 1318,1323 ----
+***************
+*** 1362,1368 ****
+
+ if (p_verbose == 0)
+ --emsg_off;
+- vimvars[VV_VAL].vv_str = NULL;
+ restore_vimvar(VV_VAL, &save_val);
+
+ return list;
+--- 1361,1366 ----
+***************
+*** 9387,9401 ****
+ {
+ typval_T rettv;
+ char_u *s;
+
+ copy_tv(tv, &vimvars[VV_VAL].vv_tv);
+ s = expr;
+ if (eval1(&s, &rettv, TRUE) == FAIL)
+! return FAIL;
+ if (*s != NUL) /* check for trailing chars after expr */
+ {
+ EMSG2(_(e_invexpr2), s);
+! return FAIL;
+ }
+ if (map)
+ {
+--- 9386,9401 ----
+ {
+ typval_T rettv;
+ char_u *s;
++ int retval = FAIL;
+
+ copy_tv(tv, &vimvars[VV_VAL].vv_tv);
+ s = expr;
+ if (eval1(&s, &rettv, TRUE) == FAIL)
+! goto theend;
+ if (*s != NUL) /* check for trailing chars after expr */
+ {
+ EMSG2(_(e_invexpr2), s);
+! goto theend;
+ }
+ if (map)
+ {
+***************
+*** 9414,9423 ****
+ /* On type error, nothing has been removed; return FAIL to stop the
+ * loop. The error message was given by get_tv_number_chk(). */
+ if (error)
+! return FAIL;
+ }
+ clear_tv(&vimvars[VV_VAL].vv_tv);
+! return OK;
+ }
+
+ /*
+--- 9414,9425 ----
+ /* On type error, nothing has been removed; return FAIL to stop the
+ * loop. The error message was given by get_tv_number_chk(). */
+ if (error)
+! goto theend;
+ }
++ retval = OK;
++ theend:
+ clear_tv(&vimvars[VV_VAL].vv_tv);
+! return retval;
+ }
+
+ /*
+*** ../vim-7.1.112/src/version.c Sun Sep 16 14:20:18 2007
+--- src/version.c Mon Sep 17 21:33:52 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 113,
+ /**/
+
+--
+Mental Floss prevents moral decay!
+
+ /// 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.1.114
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.114?rev=1021&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.114 (added)
+++ trunk/packages/vim/upstream/patches/7.1.114 Wed Sep 19 03:20:58 2007
@@ -1,0 +1,44 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.114
+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.1.114
+Problem: Memory leak in getmatches().
+Solution: Don't increment the refcount twice.
+Files: src/eval.c
+
+
+*** ../vim-7.1.113/src/eval.c Mon Sep 17 21:37:09 2007
+--- src/eval.c Sun Sep 16 19:24:49 2007
+***************
+*** 10351,10357 ****
+ dict = dict_alloc();
+ if (dict == NULL)
+ return;
+- ++dict->dv_refcount;
+ dict_add_nr_str(dict, "group", 0L, syn_id2name(cur->hlg_id));
+ dict_add_nr_str(dict, "pattern", 0L, cur->pattern);
+ dict_add_nr_str(dict, "priority", (long)cur->priority, NULL);
+--- 10355,10360 ----
+*** ../vim-7.1.113/src/version.c Mon Sep 17 21:37:09 2007
+--- src/version.c Mon Sep 17 21:54:08 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 114,
+ /**/
+
+--
+Be nice to your kids... they'll be the ones choosing your nursing home.
+
+ /// 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.1.115
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.115?rev=1021&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.115 (added)
+++ trunk/packages/vim/upstream/patches/7.1.115 Wed Sep 19 03:20:58 2007
@@ -1,0 +1,51 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.115
+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.1.115 (after 7.1.105)
+Problem: Compiler warning for uninitialized variable. (Tony Mechelynck)
+Solution: Init variable to NULL.
+Files: src/eval.c
+
+
+*** ../vim-7.1.114/src/eval.c Mon Sep 17 21:55:02 2007
+--- src/eval.c Sun Sep 16 19:24:49 2007
+***************
+*** 6704,6710 ****
+ dict_T *d = NULL;
+ typval_T tvkey;
+ typval_T tv;
+! char_u *key;
+ dictitem_T *item;
+ char_u *start = skipwhite(*arg + 1);
+ char_u buf[NUMBUFLEN];
+--- 6705,6711 ----
+ dict_T *d = NULL;
+ typval_T tvkey;
+ typval_T tv;
+! char_u *key = NULL;
+ dictitem_T *item;
+ char_u *start = skipwhite(*arg + 1);
+ char_u buf[NUMBUFLEN];
+*** ../vim-7.1.114/src/version.c Mon Sep 17 21:55:02 2007
+--- src/version.c Mon Sep 17 22:18:42 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 115,
+ /**/
+
+--
+Proofread carefully to see if you any words out.
+
+ /// 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.1.116
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.116?rev=1021&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.116 (added)
+++ trunk/packages/vim/upstream/patches/7.1.116 Wed Sep 19 03:20:58 2007
@@ -1,0 +1,119 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.116
+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.1.116
+Problem: Cannot display Unicode characters above 0x10000.
+Solution: Remove the replacement with a question mark when UNICODE16 is not
+ defined. (partly by Nicolas Weber)
+Files: src/screen.c
+
+
+*** ../vim-7.1.115/src/screen.c Thu Aug 30 13:51:52 2007
+--- src/screen.c Mon Sep 10 22:29:42 2007
+***************
+*** 2305,2313 ****
+--- 2305,2315 ----
+ prev_c = u8c;
+ #endif
+ /* Non-BMP character: display as ? or fullwidth ?. */
++ #ifdef UNICODE16
+ if (u8c >= 0x10000)
+ ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?';
+ else
++ #endif
+ ScreenLinesUC[idx] = u8c;
+ for (i = 0; i < Screen_mco; ++i)
+ {
+***************
+*** 3678,3690 ****
+ if ((mb_l == 1 && c >= 0x80)
+ || (mb_l >= 1 && mb_c == 0)
+ || (mb_l > 1 && (!vim_isprintc(mb_c)
+! || mb_c >= 0x10000)))
+ {
+ /*
+ * Illegal UTF-8 byte: display as <xx>.
+ * Non-BMP character : display as ? or fullwidth ?.
+ */
+ if (mb_c < 0x10000)
+ {
+ transchar_hex(extra, mb_c);
+ # ifdef FEAT_RIGHTLEFT
+--- 3680,3697 ----
+ if ((mb_l == 1 && c >= 0x80)
+ || (mb_l >= 1 && mb_c == 0)
+ || (mb_l > 1 && (!vim_isprintc(mb_c)
+! # ifdef UNICODE16
+! || mb_c >= 0x10000
+! # endif
+! )))
+ {
+ /*
+ * Illegal UTF-8 byte: display as <xx>.
+ * Non-BMP character : display as ? or fullwidth ?.
+ */
++ # ifdef UNICODE16
+ if (mb_c < 0x10000)
++ # endif
+ {
+ transchar_hex(extra, mb_c);
+ # ifdef FEAT_RIGHTLEFT
+***************
+*** 3692,3702 ****
+--- 3699,3711 ----
+ rl_mirror(extra);
+ # endif
+ }
++ # ifdef UNICODE16
+ else if (utf_char2cells(mb_c) != 2)
+ STRCPY(extra, "?");
+ else
+ /* 0xff1f in UTF-8: full-width '?' */
+ STRCPY(extra, "\357\274\237");
++ # endif
+
+ p_extra = extra;
+ c = *p_extra;
+***************
+*** 6245,6250 ****
+--- 6254,6260 ----
+ else
+ u8c = utfc_ptr2char(ptr, u8cc);
+ mbyte_cells = utf_char2cells(u8c);
++ # ifdef UNICODE16
+ /* Non-BMP character: display as ? or fullwidth ?. */
+ if (u8c >= 0x10000)
+ {
+***************
+*** 6252,6257 ****
+--- 6262,6268 ----
+ if (attr == 0)
+ attr = hl_attr(HLF_8);
+ }
++ # endif
+ # ifdef FEAT_ARABIC
+ if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c))
+ {
+*** ../vim-7.1.116/src/version.c Mon Sep 17 22:19:43 2007
+--- src/version.c Mon Sep 17 22:37:31 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 116,
+ /**/
+
+--
+There can't be a crisis today, my schedule is already full.
+
+ /// 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