Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package vim
The 'linebreak' patch in this upload addresses a very distracting bug
where the visual formatting of blocks of text changes every time the
user starts insert mode using Vim's c command.
The NetRW patch fixes an error that will make any callers of the
function fail.
$ debdiff vim_7.4.488-6.dsc vim_7.4.488-7.dsc
diffstat for vim-7.4.488 vim-7.4.488
changelog | 9 ++
patches/series | 2
patches/upstream/netrwSavePosn.patch | 11 ++
patches/upstream/v7-4-576.patch | 148 +++++++++++++++++++++++++++++++++++
4 files changed, 170 insertions(+)
diff -Nru vim-7.4.488/debian/changelog vim-7.4.488/debian/changelog
--- vim-7.4.488/debian/changelog 2015-03-21 14:24:12.000000000 -0400
+++ vim-7.4.488/debian/changelog 2015-03-30 20:53:46.000000000 -0400
@@ -1,3 +1,12 @@
+vim (2:7.4.488-7) UNRELEASED; urgency=medium
+
+ * Backport patch 7.4.576 to fix jarring toggling of 'linebreak' option when
+ using the c command to change the buffer. (Closes: #774492)
+ * Backport upstream fix for call to unknown function in NetRW plugin.
+ (Closes: #768467)
+
+ -- James McCoy <james...@debian.org> Mon, 30 Mar 2015 20:48:28 -0400
+
vim (2:7.4.488-6) unstable; urgency=medium
* Build vim logo from the eps instead of pdf so the svg has the correct
diff -Nru vim-7.4.488/debian/patches/series vim-7.4.488/debian/patches/series
--- vim-7.4.488/debian/patches/series 2014-11-04 19:41:11.000000000 -0500
+++ vim-7.4.488/debian/patches/series 2015-03-30 20:44:15.000000000 -0400
@@ -3,6 +3,8 @@
upstream/pythoncomplete-autoload-init.patch
upstream/debcontrol-syntax-vcs-git.patch
upstream/debian-runtime-versions.patch
+upstream/v7-4-576.patch
+upstream/netrwSavePosn.patch
debian/vim-tiny.patch
debian/disabled-modelines.patch
debian/extra-tex-detection.patch
diff -Nru vim-7.4.488/debian/patches/upstream/netrwSavePosn.patch
vim-7.4.488/debian/patches/upstream/netrwSavePosn.patch
--- vim-7.4.488/debian/patches/upstream/netrwSavePosn.patch 1969-12-31
19:00:00.000000000 -0500
+++ vim-7.4.488/debian/patches/upstream/netrwSavePosn.patch 2015-03-30
20:46:43.000000000 -0400
@@ -0,0 +1,11 @@
+--- a/runtime/autoload/netrwSettings.vim
++++ b/runtime/autoload/netrwSettings.vim
+@@ -31,7 +31,7 @@
+ " NetrwSettings: {{{1
+ fun! netrwSettings#NetrwSettings()
+ " this call is here largely just to insure that netrw has been loaded
+- call netrw#NetrwSavePosn()
++ call netrw#SavePosn()
+ if !exists("g:loaded_netrw")
+ echohl WarningMsg | echomsg "***sorry*** netrw needs to be loaded prior to
using NetrwSettings" | echohl None
+ return
diff -Nru vim-7.4.488/debian/patches/upstream/v7-4-576.patch
vim-7.4.488/debian/patches/upstream/v7-4-576.patch
--- vim-7.4.488/debian/patches/upstream/v7-4-576.patch 1969-12-31
19:00:00.000000000 -0500
+++ vim-7.4.488/debian/patches/upstream/v7-4-576.patch 2015-03-30
20:43:31.000000000 -0400
@@ -0,0 +1,148 @@
+changeset: 6888:749fc929da45
+tag: v7-4-576
+user: Bram Moolenaar <b...@vim.org>
+date: Wed Jan 14 17:52:30 2015 +0100
+files: src/normal.c src/version.c
+description:
+updated for version 7.4.576
+Problem: Redrawing problem with 'relativenumber' and 'linebreak'.
+Solution: Temporarily reset 'linebreak' and restore it in more places.
+ (Christian Brabandt)
+
+
+diff --git a/src/normal.c b/src/normal.c
+--- a/src/normal.c
++++ b/src/normal.c
+@@ -1393,10 +1393,6 @@
+ int include_line_break = FALSE;
+ #endif
+
+-#ifdef FEAT_LINEBREAK
+- curwin->w_p_lbr = FALSE; /* Avoid a problem with unwanted linebreaks in
+- * block mode. */
+-#endif
+ #if defined(FEAT_CLIPBOARD)
+ /*
+ * Yank the visual area into the GUI selection register before we operate
+@@ -1420,6 +1416,10 @@
+ */
+ if ((finish_op || VIsual_active) && oap->op_type != OP_NOP)
+ {
++#ifdef FEAT_LINEBREAK
++ /* Avoid a problem with unwanted linebreaks in block mode. */
++ curwin->w_p_lbr = FALSE;
++#endif
+ oap->is_VIsual = VIsual_active;
+ if (oap->motion_force == 'V')
+ oap->motion_type = MLINE;
+@@ -1819,7 +1819,13 @@
+ || oap->op_type == OP_FUNCTION
+ || oap->op_type == OP_FILTER)
+ && oap->motion_force == NUL)
++ {
++#ifdef FEAT_LINEBREAK
++ /* make sure redrawing is correct */
++ curwin->w_p_lbr = lbr_saved;
++#endif
+ redraw_curbuf_later(INVERTED);
++ }
+ }
+ }
+
+@@ -1863,7 +1869,12 @@
+ || oap->op_type == OP_FOLD
+ #endif
+ ))
++ {
++#ifdef FEAT_LINEBREAK
++ curwin->w_p_lbr = lbr_saved;
++#endif
+ redraw_curbuf_later(INVERTED);
++ }
+
+ /*
+ * If the end of an operator is in column one while oap->motion_type
+@@ -1947,7 +1958,12 @@
+ }
+ }
+ else
++ {
++#ifdef FEAT_LINEBREAK
++ curwin->w_p_lbr = lbr_saved;
++#endif
+ (void)op_yank(oap, FALSE, !gui_yank);
++ }
+ check_cursor_col();
+ break;
+
+@@ -1969,6 +1985,11 @@
+ else
+ restart_edit_save = 0;
+ restart_edit = 0;
++#ifdef FEAT_LINEBREAK
++ /* Restore linebreak, so that when the user edits it looks as
++ * before. */
++ curwin->w_p_lbr = lbr_saved;
++#endif
+ /* Reset finish_op now, don't want it set inside edit(). */
+ finish_op = FALSE;
+ if (op_change(oap)) /* will call edit() */
+@@ -2064,8 +2085,16 @@
+ * Visual mode. But do this only once. */
+ restart_edit_save = restart_edit;
+ restart_edit = 0;
+-
++#ifdef FEAT_LINEBREAK
++ /* Restore linebreak, so that when the user edits it looks as
++ * before. */
++ curwin->w_p_lbr = lbr_saved;
++#endif
+ op_insert(oap, cap->count1);
++#ifdef FEAT_LINEBREAK
++ /* Reset linebreak, so that formatting works correctly. */
++ curwin->w_p_lbr = FALSE;
++#endif
+
+ /* TODO: when inserting in several lines, should format all
+ * the lines. */
+@@ -2090,7 +2119,14 @@
+ }
+ #ifdef FEAT_VISUALEXTRA
+ else
++ {
++#ifdef FEAT_LINEBREAK
++ /* Restore linebreak, so that when the user edits it looks as
++ * before. */
++ curwin->w_p_lbr = lbr_saved;
++#endif
+ op_replace(oap, cap->nchar);
++ }
+ #endif
+ break;
+
+@@ -2134,7 +2170,12 @@
+ if (!p_sol && oap->motion_type == MLINE && !oap->end_adjusted
+ && (oap->op_type == OP_LSHIFT || oap->op_type == OP_RSHIFT
+ || oap->op_type == OP_DELETE))
++ {
++#ifdef FEAT_LINEBREAK
++ curwin->w_p_lbr = FALSE;
++#endif
+ coladvance(curwin->w_curswant = old_col);
++ }
+ }
+ else
+ {
+diff --git a/src/version.c b/src/version.c
+--- a/src/version.c
++++ b/src/version.c
+@@ -742,6 +742,8 @@
+ static int included_patches[] =
+ { /* Add new patch number below this line */
+ /**/
++ 576,
++/**/
+ 488,
+ /**/
+ 487,
+
unblock vim/2:7.4.488-7
-- System Information:
Debian Release: 8.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
