[vim] 06/20: Rebase patches on 8.0.0923
James McCoy
jamessan at debian.org
Sun Aug 13 20:08:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch debian/sid
in repository vim.
commit 14938d5dee8e90d2c212c75104dc6a6e1d784f32
Author: James McCoy <jamessan at debian.org>
Date: Sun Aug 13 09:10:59 2017 -0400
Rebase patches on 8.0.0923
- Drop backported patches
Signed-off-by: James McCoy <jamessan at debian.org>
---
...of-more-LaTeX-commands-for-tex-filetype-d.patch | 4 +-
...s-decision-to-disable-modelines-by-defaul.patch | 4 +-
...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch | 18 +++---
...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch | 6 +-
...llegal-memory-access-with-empty-doau-comm.patch | 69 ----------------------
...rash-when-cancelling-the-cmdline-window-i.patch | 42 -------------
...reeing-wrong-memory-with-certain-autocomm.patch | 40 -------------
7 files changed, 16 insertions(+), 167 deletions(-)
diff --git a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
index ba92b06..c008e27 100644
--- a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
+++ b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
@@ -13,10 +13,10 @@ Signed-off-by: James McCoy <jamessan at debian.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
-index 0fb6596..d467350 100644
+index de00f23..b45da2b 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
-@@ -2268,7 +2268,7 @@ func! s:FTtex()
+@@ -2280,7 +2280,7 @@ func! s:FTtex()
call cursor(1,1)
let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
diff --git a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
index 5dfbabb..1d5dde4 100644
--- a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
+++ b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
@@ -15,10 +15,10 @@ Signed-off-by: James McCoy <jamessan at debian.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
-index 4a775fc..a08b173 100644
+index 73955f4..4ab969c 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
-@@ -5126,7 +5126,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5221,7 +5221,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'modeline'* *'ml'* *'nomodeline'* *'noml'*
'modeline' 'ml' boolean (Vim default: on (off for root),
diff --git a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
index 48fa1c0..a5246e7 100644
--- a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
+++ b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
@@ -17,10 +17,10 @@ Signed-off-by: James Vega <jamessan at debian.org>
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/main.c b/src/main.c
-index 67c0a30..29eb787 100644
+index 4b787a3..a0331f4 100644
--- a/src/main.c
+++ b/src/main.c
-@@ -1773,6 +1773,10 @@ parse_command_name(mparm_T *parmp)
+@@ -1790,6 +1790,10 @@ parse_command_name(mparm_T *parmp)
}
else if (STRNICMP(initstr, "vim", 3) == 0)
initstr += 3;
@@ -31,7 +31,7 @@ index 67c0a30..29eb787 100644
/* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
if (STRICMP(initstr, "diff") == 0)
-@@ -3016,7 +3020,12 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3041,7 +3045,12 @@ source_startup_scripts(mparm_T *parmp)
* Get system wide defaults, if the file name is defined.
*/
#ifdef SYS_VIMRC_FILE
@@ -45,16 +45,16 @@ index 67c0a30..29eb787 100644
#endif
#ifdef MACOS_X
(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
-@@ -3052,6 +3061,9 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3076,6 +3085,9 @@ source_startup_scripts(mparm_T *parmp)
+ && do_source((char_u *)USR_EXRC_FILE, FALSE, DOSO_NONE) == FAIL
#ifdef USR_EXRC_FILE2
&& do_source((char_u *)USR_EXRC_FILE2, FALSE, DOSO_NONE) == FAIL
- #endif
++#endif
+#if defined(SYS_TINYRC_FILE) && defined(TINY_VIMRC)
+ && !parmp->vi_mode
-+#endif
+ #endif
&& !has_dash_c_arg)
{
- /* When no .vimrc file was found: source defaults.vim. */
diff --git a/src/os_unix.h b/src/os_unix.h
index 695affa..b6e7e59 100644
--- a/src/os_unix.h
@@ -70,10 +70,10 @@ index 695affa..b6e7e59 100644
# define SYS_VIMRC_FILE "$VIM/vimrc"
#endif
diff --git a/src/structs.h b/src/structs.h
-index c7aa8f2..bf4980d 100644
+index 91326f6..b43439d 100644
--- a/src/structs.h
+++ b/src/structs.h
-@@ -3300,6 +3300,9 @@ typedef struct
+@@ -3342,6 +3342,9 @@ typedef struct
#ifdef FEAT_DIFF
int diff_mode; /* start with 'diff' set */
#endif
diff --git a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
index 9904b15..625f952 100644
--- a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
+++ b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
@@ -23,7 +23,7 @@ preprocessor's __DATE__/__TIME__ symbols will be used.
3 files changed, 19 insertions(+)
diff --git a/src/config.h.in b/src/config.h.in
-index a934507..95b2eab 100644
+index fe68d49..7e6e504 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -30,6 +30,9 @@
@@ -37,7 +37,7 @@ index a934507..95b2eab 100644
#undef HAVE_ATTRIBUTE_UNUSED
diff --git a/src/configure.ac b/src/configure.ac
-index 1c1b1c7..db5a45e 100644
+index ea4df8f..da97804 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -29,6 +29,16 @@ dnl in autoconf needs it, where it uses STDC_HEADERS.
@@ -58,7 +58,7 @@ index 1c1b1c7..db5a45e 100644
AC_MSG_CHECKING(--enable-fail-if-missing argument)
diff --git a/src/version.c b/src/version.c
-index 4e7558a..220ed8b 100644
+index 3833f58..283c108 100644
--- a/src/version.c
+++ b/src/version.c
@@ -44,11 +44,17 @@ make_version(void)
diff --git a/debian/patches/upstream/patch-8.0.0703-illegal-memory-access-with-empty-doau-comm.patch b/debian/patches/upstream/patch-8.0.0703-illegal-memory-access-with-empty-doau-comm.patch
deleted file mode 100644
index 0173497..0000000
--- a/debian/patches/upstream/patch-8.0.0703-illegal-memory-access-with-empty-doau-comm.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Bram Moolenaar <Bram at vim.org>
-Date: Sun, 9 Jul 2017 11:07:16 +0200
-Subject: patch 8.0.0703: illegal memory access with empty :doau command
-
-Problem: Illegal memory access with empty :doau command.
-Solution: Check the event for being out of range. (James McCoy)
----
- src/fileio.c | 7 ++++---
- src/testdir/test_autocmd.vim | 4 ++++
- src/version.c | 2 ++
- 3 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/fileio.c b/src/fileio.c
-index aeb53b5..d305c82 100644
---- a/src/fileio.c
-+++ b/src/fileio.c
-@@ -8790,7 +8790,7 @@ do_doautocmd(
- /*
- * Loop over the events.
- */
-- while (*arg && !vim_iswhite(*arg))
-+ while (*arg && !ends_excmd(*arg) && !vim_iswhite(*arg))
- if (apply_autocmds_group(event_name2nr(arg, &arg),
- fname, NULL, TRUE, group, curbuf, NULL))
- nothing_done = FALSE;
-@@ -9306,7 +9306,8 @@ apply_autocmds_group(
- * Quickly return if there are no autocommands for this event or
- * autocommands are blocked.
- */
-- if (first_autopat[(int)event] == NULL || autocmd_blocked > 0)
-+ if (event == NUM_EVENTS || first_autopat[(int)event] == NULL
-+ || autocmd_blocked > 0)
- goto BYPASS_AU;
-
- /*
-@@ -9379,7 +9380,7 @@ apply_autocmds_group(
- {
- if (event == EVENT_COLORSCHEME || event == EVENT_OPTIONSET)
- autocmd_fname = NULL;
-- else if (fname != NULL && *fname != NUL)
-+ else if (fname != NULL && !ends_excmd(*fname))
- autocmd_fname = fname;
- else if (buf != NULL)
- autocmd_fname = buf->b_ffname;
-diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
-index 566a07c..2a783f4 100644
---- a/src/testdir/test_autocmd.vim
-+++ b/src/testdir/test_autocmd.vim
-@@ -341,3 +341,7 @@ func Test_BufEnter()
- call delete('Xdir', 'd')
- au! BufEnter
- endfunc
-+
-+func Test_empty_doau()
-+ doau \|
-+endfunc
-diff --git a/src/version.c b/src/version.c
-index b10438e..6781ef2 100644
---- a/src/version.c
-+++ b/src/version.c
-@@ -771,6 +771,8 @@ static char *(features[]) =
- static int included_patches[] =
- { /* Add new patch number below this line */
- /**/
-+ 703,
-+/**/
- 550,
- /**/
- 378,
diff --git a/debian/patches/upstream/patch-8.0.0706-crash-when-cancelling-the-cmdline-window-i.patch b/debian/patches/upstream/patch-8.0.0706-crash-when-cancelling-the-cmdline-window-i.patch
deleted file mode 100644
index 56eb6bb..0000000
--- a/debian/patches/upstream/patch-8.0.0706-crash-when-cancelling-the-cmdline-window-i.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Bram Moolenaar <Bram at vim.org>
-Date: Tue, 11 Jul 2017 15:11:57 +0200
-Subject: patch 8.0.0706: crash when cancelling the cmdline window in Ex mode
-
-Problem: Crash when cancelling the cmdline window in Ex mode. (James McCoy)
-Solution: Do not set cmdbuff to NULL, make it empty.
----
- src/ex_getln.c | 6 ++++++
- src/version.c | 2 ++
- 2 files changed, 8 insertions(+)
-
-diff --git a/src/ex_getln.c b/src/ex_getln.c
-index 581c444..f0a4329 100644
---- a/src/ex_getln.c
-+++ b/src/ex_getln.c
-@@ -7003,7 +7003,13 @@ ex_window(void)
- else
- ccline.cmdbuff = vim_strsave(ml_get_curline());
- if (ccline.cmdbuff == NULL)
-+ {
-+ ccline.cmdbuff = vim_strsave((char_u *)"");
-+ ccline.cmdlen = 0;
-+ ccline.cmdbufflen = 1;
-+ ccline.cmdpos = 0;
- cmdwin_result = Ctrl_C;
-+ }
- else
- {
- ccline.cmdlen = (int)STRLEN(ccline.cmdbuff);
-diff --git a/src/version.c b/src/version.c
-index 6781ef2..6986625 100644
---- a/src/version.c
-+++ b/src/version.c
-@@ -771,6 +771,8 @@ static char *(features[]) =
- static int included_patches[] =
- { /* Add new patch number below this line */
- /**/
-+ 706,
-+/**/
- 703,
- /**/
- 550,
diff --git a/debian/patches/upstream/patch-8.0.0707-freeing-wrong-memory-with-certain-autocomm.patch b/debian/patches/upstream/patch-8.0.0707-freeing-wrong-memory-with-certain-autocomm.patch
deleted file mode 100644
index 873a87e..0000000
--- a/debian/patches/upstream/patch-8.0.0707-freeing-wrong-memory-with-certain-autocomm.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Bram Moolenaar <Bram at vim.org>
-Date: Tue, 11 Jul 2017 18:28:46 +0200
-Subject: patch 8.0.0707: freeing wrong memory with certain autocommands
-
-Problem: Freeing wrong memory when manipulating buffers in autocommands.
- (James McCoy)
-Solution: Also set the w_s pointer if w_buffer was NULL.
----
- src/ex_cmds.c | 4 ++--
- src/version.c | 2 ++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/ex_cmds.c b/src/ex_cmds.c
-index 00cac92..628d27b 100644
---- a/src/ex_cmds.c
-+++ b/src/ex_cmds.c
-@@ -3967,8 +3967,8 @@ do_ecmd(
- * <VN> We could instead free the synblock
- * and re-attach to buffer, perhaps.
- */
-- if (curwin->w_buffer != NULL
-- && curwin->w_s == &(curwin->w_buffer->b_s))
-+ if (curwin->w_buffer == NULL
-+ || curwin->w_s == &(curwin->w_buffer->b_s))
- curwin->w_s = &(buf->b_s);
- #endif
- curwin->w_buffer = buf;
-diff --git a/src/version.c b/src/version.c
-index 6986625..59ef8b2 100644
---- a/src/version.c
-+++ b/src/version.c
-@@ -771,6 +771,8 @@ static char *(features[]) =
- static int included_patches[] =
- { /* Add new patch number below this line */
- /**/
-+ 707,
-+/**/
- 706,
- /**/
- 703,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git
More information about the pkg-vim-maintainers
mailing list