r783 - in /trunk/packages/vim: debian/README debian/changelog
upstream/patches/7.0.122
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Mon Oct 9 23:37:58 UTC 2006
Author: jamessan
Date: Mon Oct 9 23:37:58 2006
New Revision: 783
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=783
Log:
May as well add patch 122 since the last upload was rejected.
Added:
trunk/packages/vim/upstream/patches/7.0.122
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=783&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Mon Oct 9 23:37:58 2006
@@ -146,3 +146,4 @@
1412 7.0.119 CursorHold event is not triggered when leaving Insert mode
1780 7.0.120 crash when using getreg('=') in the = register
1549 7.0.121 GUI: dragging last status line doesn't work with text tabline
+ 2865 7.0.122 only half of double-wide bold character may be drawn
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=783&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Oct 9 23:37:58 2006
@@ -1,7 +1,7 @@
-vim (1:7.0-121+1) unstable; urgency=medium
+vim (1:7.0-122+1) unstable; urgency=medium
[ Debian Vim Maintainers ]
- * New upstream patches (095 - 121), see README.gz for details.
+ * New upstream patches (095 - 122), see README.gz for details.
* Urgency medium for RC bug fixes.
[ James Vega ]
@@ -28,7 +28,7 @@
usage of perldoc/pydoc/ri for keyword lookup on perl/python/ruby files.
(closes: #389332)
- -- James Vega <jamessan at debian.org> Sun, 8 Oct 2006 19:32:57 -0400
+ -- James Vega <jamessan at debian.org> Mon, 9 Oct 2006 19:37:58 -0400
vim (1:7.0-094+1) unstable; urgency=medium
Added: trunk/packages/vim/upstream/patches/7.0.122
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.122?rev=783&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.122 (added)
+++ trunk/packages/vim/upstream/patches/7.0.122 Mon Oct 9 23:37:58 2006
@@ -1,0 +1,92 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.122
+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.122
+Problem: GUI: When clearing after a bold, double-wide character half a
+ character may be drawn.
+Solution: Check for double-wide character and redraw it. (Yukihiro Nakadaira)
+Files: src/screen.c
+
+
+*** ../vim-7.0.121/src/screen.c Thu Sep 14 21:04:09 2006
+--- src/screen.c Sat Oct 7 15:13:43 2006
+***************
+*** 5079,5093 ****
+ * character too. If we didn't skip any blanks above, then we
+ * only redraw if the character wasn't already redrawn anyway.
+ */
+! if (gui.in_use && (col > startCol || !redraw_this)
+! # ifdef FEAT_MBYTE
+! && enc_dbcs == 0
+! # endif
+! )
+ {
+ hl = ScreenAttrs[off_to];
+ if (hl > HL_ALL || (hl & HL_BOLD))
+! screen_char(off_to - 1, row, col + coloff - 1);
+ }
+ #endif
+ screen_fill(row, row + 1, col + coloff, clear_width + coloff,
+--- 5079,5116 ----
+ * character too. If we didn't skip any blanks above, then we
+ * only redraw if the character wasn't already redrawn anyway.
+ */
+! if (gui.in_use && (col > startCol || !redraw_this))
+ {
+ hl = ScreenAttrs[off_to];
+ if (hl > HL_ALL || (hl & HL_BOLD))
+! {
+! int prev_cells = 1;
+! # ifdef FEAT_MBYTE
+! if (enc_utf8)
+! /* for utf-8, ScreenLines[char_offset + 1] == 0 means
+! * that its width is 2. */
+! prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1;
+! else if (enc_dbcs != 0)
+! {
+! /* find previous character by counting from first
+! * column and get its width. */
+! unsigned off = LineOffset[row];
+!
+! while (off < off_to)
+! {
+! prev_cells = (*mb_off2cells)(off);
+! off += prev_cells;
+! }
+! }
+!
+! if (enc_dbcs != 0 && prev_cells > 1)
+! screen_char_2(off_to - prev_cells, row,
+! col + coloff - prev_cells);
+! else
+! # endif
+! screen_char(off_to - prev_cells, row,
+! col + coloff - prev_cells);
+! }
+ }
+ #endif
+ screen_fill(row, row + 1, col + coloff, clear_width + coloff,
+*** ../vim-7.0.121/src/version.c Sun Oct 8 13:56:53 2006
+--- src/version.c Mon Oct 9 22:10:17 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 122,
+ /**/
+
+--
+How To Keep A Healthy Level Of Insanity:
+7. Finish all your sentences with "in accordance with the prophecy".
+
+ /// 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