r732 - in /trunk/packages/vim: debian/README debian/changelog
upstream/patches/7.0.036 upstream/patches/7.0.037
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Wed Jul 12 00:28:37 UTC 2006
Author: jamessan
Date: Wed Jul 12 00:28:35 2006
New Revision: 732
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=732
Log:
Upstream patches 036 and 037
Added:
trunk/packages/vim/upstream/patches/7.0.036
trunk/packages/vim/upstream/patches/7.0.037
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=732&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed Jul 12 00:28:35 2006
@@ -60,3 +60,5 @@
2431 7.0.033 pasting after autoindent removes the indent
2042 7.0.034 repeating completion was wrong after typing text or using BS
5905 7.0.035 repeating Insert mode completion doesn't work properly
+ 3990 7.0.036 can't compile with small features and syntax HL
+ 1880 7.0.037 crash when resizing Vim window when a line doesn't fit
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=732&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Jul 12 00:28:35 2006
@@ -1,3 +1,10 @@
+vim (1:7.0-037+1) UNRELEASED; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream patches (036 - 037), see README.gz for details.
+
+ -- James Vega <jamessan at debian.org> Tue, 11 Jul 2006 20:27:07 -0400
+
vim (1:7.0-035+1) unstable; urgency=low
[ Debian Vim Maintainers ]
Added: trunk/packages/vim/upstream/patches/7.0.036
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.036?rev=732&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.036 (added)
+++ trunk/packages/vim/upstream/patches/7.0.036 Wed Jul 12 00:28:35 2006
@@ -1,0 +1,140 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.036
+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.036
+Problem: Can't compile with small features and syntax highlighting or the
+ diff feature.
+Solution: Define LINE_ATTR whenever syntax highlighting or the diff feature
+ is enabled.
+Files: src/screen.c
+
+
+*** ../vim-7.0.035/src/screen.c Fri May 5 23:13:04 2006
+--- src/screen.c Tue Jul 11 21:33:53 2006
+***************
+*** 2612,2618 ****
+ #ifdef FEAT_LINEBREAK
+ int need_showbreak = FALSE;
+ #endif
+! #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS))
+ # define LINE_ATTR
+ int line_attr = 0; /* atrribute for the whole line */
+ #endif
+--- 2612,2619 ----
+ #ifdef FEAT_LINEBREAK
+ int need_showbreak = FALSE;
+ #endif
+! #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \
+! || defined(FEAT_SYN_HL) || defined(FEAT_DIFF)
+ # define LINE_ATTR
+ int line_attr = 0; /* atrribute for the whole line */
+ #endif
+***************
+*** 2626,2632 ****
+ int prev_c = 0; /* previous Arabic character */
+ int prev_c1 = 0; /* first composing char for prev_c */
+ #endif
+! #if defined(FEAT_DIFF) || defined(LINE_ATTR)
+ int did_line_attr = 0;
+ #endif
+
+--- 2627,2633 ----
+ int prev_c = 0; /* previous Arabic character */
+ int prev_c1 = 0; /* first composing char for prev_c */
+ #endif
+! #if defined(LINE_ATTR)
+ int did_line_attr = 0;
+ #endif
+
+***************
+*** 4116,4132 ****
+ --ptr; /* put it back at the NUL */
+ }
+ #endif
+! #if defined(FEAT_DIFF) || defined(LINE_ATTR)
+ else if ((
+ # ifdef FEAT_DIFF
+! diff_hlf != (hlf_T)0
+! # ifdef LINE_ATTR
+! ||
+! # endif
+ # endif
+- # ifdef LINE_ATTR
+ line_attr != 0
+- # endif
+ ) && (
+ # ifdef FEAT_RIGHTLEFT
+ wp->w_p_rl ? (col >= 0) :
+--- 4117,4128 ----
+ --ptr; /* put it back at the NUL */
+ }
+ #endif
+! #if defined(LINE_ATTR)
+ else if ((
+ # ifdef FEAT_DIFF
+! diff_hlf != (hlf_T)0 ||
+ # endif
+ line_attr != 0
+ ) && (
+ # ifdef FEAT_RIGHTLEFT
+ wp->w_p_rl ? (col >= 0) :
+***************
+*** 4237,4243 ****
+ * At end of the text line or just after the last character.
+ */
+ if (c == NUL
+! #if defined(FEAT_DIFF) || defined(LINE_ATTR)
+ || did_line_attr == 1
+ #endif
+ )
+--- 4233,4239 ----
+ * At end of the text line or just after the last character.
+ */
+ if (c == NUL
+! #if defined(LINE_ATTR)
+ || did_line_attr == 1
+ #endif
+ )
+***************
+*** 4258,4264 ****
+ || prevcol == (long)match_hl[0].startcol
+ || prevcol == (long)match_hl[1].startcol
+ || prevcol == (long)match_hl[2].startcol)
+! # if defined(FEAT_DIFF) || defined(LINE_ATTR)
+ && did_line_attr <= 1
+ # endif
+ )
+--- 4254,4260 ----
+ || prevcol == (long)match_hl[0].startcol
+ || prevcol == (long)match_hl[1].startcol
+ || prevcol == (long)match_hl[2].startcol)
+! # if defined(LINE_ATTR)
+ && did_line_attr <= 1
+ # endif
+ )
+*** ../vim-7.0.035/src/version.c Fri Jun 23 21:36:49 2006
+--- src/version.c Tue Jul 11 21:36:50 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 36,
+ /**/
+
+--
+Every engineer dreams about saving the universe and having sex with aliens.
+This is much more glamorous than the real life of an engineer, which consists
+of hiding from the universe and having sex without the participation of other
+life forms. (Scott Adams - The Dilbert principle)
+
+ /// 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.037
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.037?rev=732&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.037 (added)
+++ trunk/packages/vim/upstream/patches/7.0.037 Wed Jul 12 00:28:35 2006
@@ -1,0 +1,63 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.037
+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.037
+Problem: Crash when resizing the GUI window vertically when there is a line
+ that doesn't fit.
+Solution: Don't redraw while the screen data is invalid.
+Files: src/screen.c
+
+
+*** ../vim-7.0.036/src/screen.c Tue Jul 11 22:36:19 2006
+--- src/screen.c Tue Jul 11 21:33:53 2006
+***************
+*** 7129,7134 ****
+--- 7129,7140 ----
+ return;
+ entered = TRUE;
+
++ /*
++ * Note that the window sizes are updated before reallocating the arrays,
++ * thus we must not redraw here!
++ */
++ ++RedrawingDisabled;
++
+ win_new_shellsize(); /* fit the windows in the new sized shell */
+
+ comp_col(); /* recompute columns for shown command and ruler */
+***************
+*** 7363,7368 ****
+--- 7369,7375 ----
+ #endif
+
+ entered = FALSE;
++ --RedrawingDisabled;
+
+ #ifdef FEAT_AUTOCMD
+ if (starting == 0)
+*** ../vim-7.0.036/src/version.c Tue Jul 11 22:36:19 2006
+--- src/version.c Tue Jul 11 22:38:39 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 37,
+ /**/
+
+--
+For society, it's probably a good thing that engineers value function over
+appearance. For example, you wouldn't want engineers to build nuclear power
+plants that only _look_ like they would keep all the radiation inside.
+ (Scott Adams - The Dilbert principle)
+
+ /// 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