[vim] 02/02: Update changelogs/patches for 8.0.1401
James McCoy
jamessan at debian.org
Mon Dec 18 03:14:19 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 6cc39fd0a907196930b2c36532a1efa042fb663b
Author: James McCoy <jamessan at debian.org>
Date: Sun Dec 17 21:55:44 2017 -0500
Update changelogs/patches for 8.0.1401
Drop patches applied upstream:
- syntax-debcontrol.vim-Build-syntax-from-lists-and-add-gol.patch
- syntax-debcontrol.vim-Sync-up-with-deb-src-control-5.patch
- test_search-Waitfor-g-lines-to-be-visible.patch
Signed-off-by: James McCoy <jamessan at debian.org>
---
debian/changelog | 10 +-
debian/changelog.upstream | 146 ++++++++++++++++++++-
...of-more-LaTeX-commands-for-tex-filetype-d.patch | 12 +-
...t-filetype-using-the-contents-of-the-file.patch | 2 +-
...s-decision-to-disable-modelines-by-defaul.patch | 4 +-
...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch | 6 +-
debian/patches/series | 3 -
...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch | 6 +-
...ource-changelog-.vim-Update-release-names.patch | 41 +-----
...l.vim-Build-syntax-from-lists-and-add-gol.patch | 95 --------------
...ontrol.vim-Sync-up-with-deb-src-control-5.patch | 91 -------------
...test_search-WaitFor-g-lines-to-be-visible.patch | 45 -------
12 files changed, 171 insertions(+), 290 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1beb8f1..7641a18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
-vim (2:8.0.1257-3) UNRELEASED; urgency=medium
+vim (2:8.0.1401-1) UNRELEASED; urgency=medium
+ [ upstream ]
+ * syntax/sh.vim:
+ + Fix syntax highlighting of $() when the /bin/sh is detected as
+ POSIX-compliant. (Closes: #848663)
+ + Correctly highlight escaped single-quotes inside test expressions.
+ (Closes: #761064)
+
+ [ James McCoy ]
* runtime/debian.vim:
+ Fix mechanism used to check for <S-Insert> mappings, since maparg()
doesn't understand multiple modes in the {mode} argument. Thanks to
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index 9950bc3..2ba57a9 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -1255,7 +1255,7 @@ Individual patches for Vim 8.0:
1740 8.0.1229 condition in vim_str2nr() is always true
2557 8.0.1230 CTRL-A in Visual mode uses character after selection
2864 8.0.1231 expanding file name drops dash
- 10847 8.0.1232 MS-Windows users are confused about default mappings
+ 10847 8.0.1232 MS-Windows users are confused about default mapping
1407 8.0.1233 typo in dos installer
7047 8.0.1234 MS-Windows: composing chars are not shown properly
4732 8.0.1235 cannot disable the terminal feature in a huge build
@@ -1281,3 +1281,147 @@ Individual patches for Vim 8.0:
2329 8.0.1255 duplicate badge README file
4110 8.0.1256 typo in configure variable vim_cv_tgent
1476 8.0.1257 no test for fix of undefined behavior
+ 2713 8.0.1258 'ttymouse' is set to "sgr" even though it's not supported
+ 10851 8.0.1259 search test can be flaky
+ 16530 8.0.1260 using global variables for WaitFor()
+ 4615 8.0.1261 program in terminal window gets NL instead of CR
+ 1419 8.0.1262 terminal redir test is flaky
+ 7167 8.0.1263 others can read the swap file if a user is careless
+ 4307 8.0.1264 terminal debugger gets stuck in small window
+ 1553 8.0.1265 swap test not skipped when there is one group
+ 4535 8.0.1266 Test_swap_directory was commented out
+ 3448 8.0.1267 Test_swap_group may leave file behind
+ 11037 8.0.1268 PC install instructions are incomplete
+ 5447 8.0.1269 effect of autocommands on marks is not tested
+ 3332 8.0.1270 mismatching file name with Filelist
+ 47353 8.0.1271 still too many old style tests
+ 1889 8.0.1272 warnings for unused variables in tiny build
+ 1228 8.0.1273 old test file remaining
+ 4009 8.0.1274 setbufline() fails when using folding
+ 1831 8.0.1275 CmdlineLeave autocmd prevents fold from opening
+ 2764 8.0.1276 key lost when window closed in exit callback
+ 6078 8.0.1277 terminal window CR-NL conversions may cause problems
+ 8002 8.0.1278 GUI window always resizes when adding scrollbar
+ 29546 8.0.1279 initializing menus can be slow
+ 49591 8.0.1280 Python None cannot be converted to a Vim type
+ 67887 8.0.1281 loading file type detection slows down startup
+ 2523 8.0.1282 script-local variable defined in the wrong script
+ 2002 8.0.1283 test 86 fails under ASAN
+ 4867 8.0.1284 loading file type detection slows down startup
+ 69503 8.0.1285 distributed autoload files may clash with user files
+ 1725 8.0.1286 occasional crash when using a channel
+ 3275 8.0.1287 temp file used for viminfo may have wrong permissions
+ 2356 8.0.1288 GUI: cannot drag the statusline of a terminal window
+ 3670 8.0.1289 mkview always includes the local directory
+ 5940 8.0.1290 seq_cur of undotree() wrong after undo
+ 2584 8.0.1291 C indent wrong when * immediately follows comment
+ 1806 8.0.1292 quick clicks in the WinBar start Visual mode
+ 22450 8.0.1293 setting a breakpoint in the terminal debugger sometimes fails
+ 1428 8.0.1294 GUI: get stuck when splitting a terminal window
+ 10008 8.0.1295 cannot automatically get a server name in a terminal
+ 1741 8.0.1296 checking the same condition twice
+ 1786 8.0.1297 +autoservername does not show enabled on MS-Windows
+ 1863 8.0.1298 missing test file
+ 5460 8.0.1299 bracketed paste does not work well in terminal window
+ 12151 8.0.1300 file permissions may end up wrong when writing
+ 1634 8.0.1301 generated license file for NSIS has a modeline
+ 39940 8.0.1302 still too many old style tests
+ 3171 8.0.1303 'ttymouse' is not set to "sgr" for Terminal.app and Iterm2
+ 4163 8.0.1304 CTRL-G/CTRL-T don't work with incsearch and empty pattern
+ 4684 8.0.1305 writefile() never calls fsync()
+ 2955 8.0.1306 ASAN error stack trace is not useful
+ 1592 8.0.1307 compiler warning for ignoring return value
+ 2137 8.0.1308 the "Reading from stdin" message may be undesired
+ 41138 8.0.1309 cannot use 'balloonexpr' in a terminal
+ 1498 8.0.1310 cproto generates errors because of missing type
+ 3248 8.0.1311 no test for strpart()
+150207 8.0.1312 balloon_show() only works in terminal when compiled with GUI
+ 52453 8.0.1313 missing dependencies cause parallel make to fail
+ 3632 8.0.1314 build fails on Mac
+ 1460 8.0.1315 build still fails on Mac
+ 1284 8.0.1316 build still still fails on Mac
+ 1518 8.0.1317 accessing freed memory in term_wait()
+ 17426 8.0.1318 terminal balloon only shows one line
+ 3380 8.0.1319 can't build GUI on MS-Windows
+ 1390 8.0.1320 popup test fails on GUI-only build
+ 3125 8.0.1321 can't build huge version with Athena
+ 1446 8.0.1322 textformat test isn't run
+ 2657 8.0.1323 mouse events in a terminal window may cause endless loop
+ 2304 8.0.1324 some xterm sends different mouse move codes
+ 4279 8.0.1325 more tests are not run
+ 3109 8.0.1326 largefile test fails on CI, glob test on MS-Windows
+ 1339 8.0.1327 new proto file missing from distribution
+ 4489 8.0.1328 trouble when using ":term ++close" with autocmd
+ 2188 8.0.1329 when a flaky test fails it also often fails the second time
+ 8995 8.0.1330 MS-Windows: job in terminal can't get back to Vim
+ 2272 8.0.1331 possible crash when window can be zero lines high
+ 4355 8.0.1332 highlighting in quickfix window could be better
+ 4221 8.0.1333 some tests are run twice
+ 5170 8.0.1334 splitting a window with a WinBar damages window layout
+ 1824 8.0.1335 writefile() using fsync() may give an error.
+ 17090 8.0.1336 cannot use imactivatefunc() unless compiled with +xim
+ 1625 8.0.1337 typo in #ifdef
+ 27986 8.0.1338 USE_IM_CONTROL is confusing and incomplete
+ 1815 8.0.1339 no test for what 8.0.1335 fixes
+ 1665 8.0.1340 MS-Windows: cannot build GUI without IME
+ 2208 8.0.1341 'imactivatefunc' test fails on MS-Windows
+ 1498 8.0.1342 cannot build with Motif and multi-byte
+ 40769 8.0.1343 MS-Windows: does not show colored emojis
+ 6899 8.0.1344 using 'imactivatefunc' in the GUI does not work
+ 11827 8.0.1345 race condition between stat() and open() for viminfo
+ 2123 8.0.1346 crash when passing 50 char string to balloon_split()
+ 1525 8.0.1347 MS-Windows: build broken by misplaced curly
+ 4065 8.0.1348 make testclean deletes script file on MS-Windows
+ 4583 8.0.1349 options test fails when using Motif or GTK GUI
+ 2396 8.0.1350 cannot build with +eval and -multi_byte
+ 3610 8.0.1351 warning for unused variables building with MinGW
+ 4371 8.0.1352 dead URLs in the help go unnoticed
+ 10562 8.0.1353 QuickFixCmdPost is not used consistently
+ 1800 8.0.1354 Shift-Insert doesn't always work in MS-Windows console
+ 2359 8.0.1355 cursor keys don't work in MS-Windows console
+ 2804 8.0.1356 using simalt in a GUIEnter autocommand inserts characters
+ 1792 8.0.1357 startup test fails on OpenBSD
+ 2657 8.0.1358 undercurl is not used in the terminal
+ 13037 8.0.1359 libvterm ANSI colors can not always be recognized
+ 1871 8.0.1360 the Terminal highlighting doesn't work in a terminal
+ 4624 8.0.1361 some users don't want to diff with hidden buffers
+ 6804 8.0.1362 terminal window colors wrong when using Terminal highlighting
+ 2271 8.0.1363 recovering does not work when swap file ends in .stz
+ 4536 8.0.1364 there is no easy way to get the window position
+ 4346 8.0.1365 when one channel test fails others fail as well
+ 1947 8.0.1366 balloon shows when cursor is in WinBar
+ 2264 8.0.1367 terminal test hangs, executing abcde
+ 2107 8.0.1368 cannot drag status or separator of new terminal window
+ 30841 8.0.1369 MS-Windows: drawing underline slow, mFallbackDC not updated
+ 1400 8.0.1370 channel test for callback is flaky
+ 1975 8.0.1371 Shift-Insert doesn't always work in MS-Windows console
+ 3612 8.0.1372 profile log may be truncated halfway a character
+ 1961 8.0.1373 no error when settting 'renderoptions' before starting GUI
+ 2960 8.0.1374 CTRL-A does not work with an empty line
+ 8016 8.0.1375 window size wrong after maximizing with WinBar
+ 1356 8.0.1376 cursor in terminal not always updated
+ 5816 8.0.1377 cannot call a dict function in autoloaded dict
+ 3078 8.0.1378 autoload script sources itself when defining function
+ 2683 8.0.1379 configure check for selinux does not check for header file
+ 2485 8.0.1380 using "vim -r swapfile" the hit-enter prompt is misplaced.
+ 7361 8.0.1381 ch_readraw() waits for NL if channel mode is NL
+ 2864 8.0.1382 get "no write since last change" message if terminal is open
+ 3592 8.0.1383 local additions in help skips some files
+ 21365 8.0.1384 not enough quickfix help; confusing winid
+ 12829 8.0.1385 Python 3.5 is getting old
+ 3578 8.0.1386 cannot select modified buffers with getbufinfo()
+ 13514 8.0.1387 wordcount test is old style
+ 2352 8.0.1388 char not overwritten with ambiguous width char
+ 18411 8.0.1389 getqflist() items are missing if not set
+ 15188 8.0.1390 DirectX scrolling can be slow, vertical positioning is off
+ 2983 8.0.1391 encoding empty string to JSON sometimes gives "null"
+ 2972 8.0.1392 build fails with --with-features=huge --disable-channel
+ 2343 8.0.1393 too much highlighting with 'hlsearch' and 'incsearch' set
+ 14939 8.0.1394 cannot intercept a yank command
+ 7496 8.0.1395 it is not easy to see if a colorscheme is well written
+ 1759 8.0.1396 memory leak when CTRL-G in search command line fails
+ 2664 8.0.1397 pattern with \& following nothing gives an error
+ 3820 8.0.1398 :packadd does not load packages from the "start" directory
+ 2091 8.0.1399 warnings and errors when building tiny version
+ 12045 8.0.1400 color scheme check script shows up as color scheme
+ 1520 8.0.1401 cannot build with GTK but without XIM
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 d28c344..4319f88 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
@@ -9,14 +9,14 @@ to LaTeX.
Closes: #384479
Signed-off-by: James McCoy <jamessan at debian.org>
---
- runtime/filetype.vim | 2 +-
+ runtime/autoload/dist/ft.vim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/runtime/filetype.vim b/runtime/filetype.vim
-index 328f8da..517d00a 100644
---- a/runtime/filetype.vim
-+++ b/runtime/filetype.vim
-@@ -2286,7 +2286,7 @@ func! s:FTtex()
+diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
+index 81fdc9d..654a340 100644
+--- a/runtime/autoload/dist/ft.vim
++++ b/runtime/autoload/dist/ft.vim
+@@ -653,7 +653,7 @@ func dist#ft#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/Detect-the-rst-filetype-using-the-contents-of-the-file.patch b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
index 68945d5..7f999a3 100644
--- a/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
+++ b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
@@ -8,7 +8,7 @@ Closes: #382541
1 file changed, 8 insertions(+)
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
-index e4362c8..48a5524 100644
+index 18263e2..d769c98 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -348,6 +348,14 @@ else
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 df7dac3..8341a43 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 2027a4b..a9104b2 100644
+index 41f621b..a851dd7 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
-@@ -5266,7 +5266,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5286,7 +5286,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 403749c..d588d6e 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,7 +17,7 @@ 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 97f1b03..ff5e05b 100644
+index e8006c3..27e5949 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1771,6 +1771,10 @@ parse_command_name(mparm_T *parmp)
@@ -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 774104c..6b49537 100644
+index 6aaccc5..cce8926 100644
--- a/src/structs.h
+++ b/src/structs.h
-@@ -3352,6 +3352,9 @@ typedef struct
+@@ -3348,6 +3348,9 @@ typedef struct
#ifdef FEAT_DIFF
int diff_mode; /* start with 'diff' set */
#endif
diff --git a/debian/patches/series b/debian/patches/series
index 3dc334f..a145900 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,4 @@ debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
-upstream/syntax-debcontrol.vim-Sync-up-with-deb-src-control-5.patch
upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch
-upstream/test_search-WaitFor-g-lines-to-be-visible.patch
-upstream/syntax-debcontrol.vim-Build-syntax-from-lists-and-add-gol.patch
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 220539c..cb3cb4a 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 e692d40..d3aa1a2 100644
+index 7d61220..5a2df5e 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -30,6 +30,9 @@
@@ -37,7 +37,7 @@ index e692d40..d3aa1a2 100644
#undef HAVE_ATTRIBUTE_UNUSED
diff --git a/src/configure.ac b/src/configure.ac
-index e287124..5a16797 100644
+index 0883cb7..f844404 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 e287124..5a16797 100644
AC_MSG_CHECKING(--enable-fail-if-missing argument)
diff --git a/src/version.c b/src/version.c
-index 65f5a4b..9422657 100644
+index ba65a54..4e176df 100644
--- a/src/version.c
+++ b/src/version.c
@@ -44,11 +44,17 @@ make_version(void)
diff --git a/debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch b/debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch
index d9c5804..a49fe1c 100644
--- a/debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch
+++ b/debian/patches/upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch
@@ -7,9 +7,8 @@ Move yakkety and squeeze to unsupported.
Signed-off-by: James McCoy <jamessan at debian.org>
---
- runtime/syntax/debchangelog.vim | 4 ++--
- runtime/syntax/debsources.vim | 10 +++++-----
- 2 files changed, 7 insertions(+), 7 deletions(-)
+ runtime/syntax/debchangelog.vim | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
index 6e6ed19..0d3f872 100644
@@ -33,39 +32,3 @@ index 6e6ed19..0d3f872 100644
syn match debchangelogVersion contained "(.\{-})"
syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
-diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
-index 4fa80de..6791ece 100644
---- a/runtime/syntax/debsources.vim
-+++ b/runtime/syntax/debsources.vim
-@@ -2,7 +2,7 @@
- " Language: Debian sources.list
- " Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
- " Former Maintainer: Matthijs Mohlmann <matthijs at cacholong.nl>
--" Last Change: 2017 Apr 22
-+" Last Change: 2017 Oct 28
- " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
-
- " Standard syntax initialization
-@@ -23,18 +23,18 @@ let s:cpo = &cpo
- set cpo-=C
- let s:supported = [
- \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
-- \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
-+ \ 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
- \
-- \ 'trusty', 'xenial', 'yakkety', 'zesty', 'artful', 'devel'
-+ \ 'trusty', 'xenial', 'zesty', 'artful', 'bionic', 'devel'
- \ ]
- let s:unsupported = [
- \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
-- \ 'woody', 'sarge', 'etch', 'lenny',
-+ \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze',
- \
- \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
- \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
- \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
-- \ 'utopic', 'vivid', 'wily'
-+ \ 'utopic', 'vivid', 'wily', 'yakkety'
- \ ]
- let &cpo=s:cpo
-
diff --git a/debian/patches/upstream/syntax-debcontrol.vim-Build-syntax-from-lists-and-add-gol.patch b/debian/patches/upstream/syntax-debcontrol.vim-Build-syntax-from-lists-and-add-gol.patch
deleted file mode 100644
index 07f1628..0000000
--- a/debian/patches/upstream/syntax-debcontrol.vim-Build-syntax-from-lists-and-add-gol.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: James McCoy <jamessan at debian.org>
-Date: Sat, 4 Nov 2017 00:02:06 -0400
-Subject: syntax/debcontrol.vim: Build syntax from lists and add golang
-
-Signed-off-by: James McCoy <jamessan at debian.org>
----
- runtime/syntax/debcontrol.vim | 52 ++++++++++++++++++++++++++++++++-----------
- 1 file changed, 39 insertions(+), 13 deletions(-)
-
-diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
-index 1b5d37d..b879074 100644
---- a/runtime/syntax/debcontrol.vim
-+++ b/runtime/syntax/debcontrol.vim
-@@ -3,7 +3,7 @@
- " Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
- " Former Maintainers: Gerfried Fuchs <alfie at ist.org>
- " Wichert Akkerman <wakkerma at debian.org>
--" Last Change: 2017 Oct 26
-+" Last Change: 2017 Nov 04
- " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
-
- " Standard syntax initialization
-@@ -17,6 +17,8 @@ set cpo&vim
- " Should match case except for the keys of each field
- syn case match
-
-+syn iskeyword @,48-57,-,/
-+
- " Everything that is not explicitly matched by the rules below
- syn match debcontrolElse "^.*$"
-
-@@ -24,27 +26,51 @@ syn match debcontrolElse "^.*$"
- syn match debControlComma ",[ \t]*"
- syn match debControlSpace "[ \t]"
-
--let s:kernels = '\%(linux\|hurd\|kfreebsd\|knetbsd\|kopensolaris\|netbsd\)'
--let s:archs = '\%(alpha\|amd64\|armeb\|armel\|armhf\|arm64\|avr32\|hppa\|i386'
-- \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips64el\|mips\|powerpcspe\|powerpc\|ppc64el'
-- \ . '\|ppc64\|s390x\|s390\|sh3eb\|sh3\|sh4eb\|sh4\|sh\|sparc64\|sparc\|x32\)'
--let s:pairs = 'hurd-i386\|kfreebsd-i386\|kfreebsd-amd64\|knetbsd-i386\|kopensolaris-i386\|netbsd-alpha\|netbsd-i386'
-+let s:kernels = ['linux', 'hurd', 'kfreebsd', 'knetbsd', 'kopensolaris', 'netbsd']
-+let s:archs = [
-+ \ 'alpha', 'amd64', 'armeb', 'armel', 'armhf', 'arm64', 'avr32', 'hppa'
-+ \, 'i386', 'ia64', 'lpia', 'm32r', 'm68k', 'mipsel', 'mips64el', 'mips'
-+ \, 'powerpcspe', 'powerpc', 'ppc64el', 'ppc64', 's390x', 's390', 'sh3eb'
-+ \, 'sh3', 'sh4eb', 'sh4', 'sh', 'sparc64', 'sparc', 'x32'
-+ \ ]
-+let s:pairs = [
-+ \ 'hurd-i386', 'kfreebsd-i386', 'kfreebsd-amd64', 'knetbsd-i386'
-+ \, 'kopensolaris-i386', 'netbsd-alpha', 'netbsd-i386'
-+ \ ]
-
- " Define some common expressions we can use later on
--exe 'syn match debcontrolArchitecture contained "\%(all\|'. s:kernels .'-any\|\%(any-\)\='. s:archs .'\|'. s:pairs .'\|any\)"'
-+syn keyword debcontrolArchitecture contained all any
-+exe 'syn keyword debcontrolArchitecture contained '. join(map(s:kernels, {k,v -> v .'-any'}))
-+exe 'syn keyword debcontrolArchitecture contained '. join(map(s:archs, {k,v -> 'any-'.v}))
-+exe 'syn keyword debcontrolArchitecture contained '. join(s:archs)
-+exe 'syn keyword debcontrolArchitecture contained '. join(s:pairs)
-
- unlet s:kernels s:archs s:pairs
-
--syn match debcontrolMultiArch contained "\%(no\|foreign\|allowed\|same\)"
-+let s:sections = [
-+ \ 'admin', 'cli-mono', 'comm', 'database', 'debian-installer', 'debug'
-+ \, 'devel', 'doc', 'editors', 'education', 'electronics', 'embedded'
-+ \, 'fonts', 'games', 'gnome', 'gnustep', 'gnu-r', 'golang', 'graphics'
-+ \, 'hamradio', 'haskell', 'httpd', 'interpreters', 'introspection'
-+ \, 'java', 'javascript', 'kde', 'kernel', 'libs', 'libdevel', 'lisp'
-+ \, 'localization', 'mail', 'math', 'metapackages', 'misc', 'net'
-+ \, 'news', 'ocaml', 'oldlibs', 'otherosfs', 'perl', 'php', 'python'
-+ \, 'ruby', 'rust', 'science', 'shells', 'sound', 'text', 'tex'
-+ \, 'utils', 'vcs', 'video', 'web', 'x11', 'xfce', 'zope'
-+ \ ]
-+
-+syn keyword debcontrolMultiArch contained no foreign allowed same
- syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
--syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
--syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|education|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|introspection|java%(script)=|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|rust|science|shells|s [...]
--syn match debcontrolPackageType contained "u\?deb"
-+syn keyword debcontrolPriority contained extra important optional required standard
-+exe 'syn match debcontrolSection contained "\%(\%(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\|restricted\|universe\|multiverse\)/\)\=\%('.join(s:sections, '\|').'\)"'
-+syn keyword debcontrolPackageType contained udeb deb
- syn match debcontrolVariable contained "\${.\{-}}"
--syn match debcontrolDmUpload contained "\cyes"
--syn match debcontrolYesNo contained "\%(yes\|no\)"
-+syn keyword debcontrolDmUpload contained yes
-+syn keyword debcontrolYesNo contained yes no
- syn match debcontrolR3 contained "\<\%(no\|binary-targets\|[[:graph:]]\+/[[:graph:]]\+\%( \+[[:graph:]]\+/[[:graph:]]\+\)*\)\>"
-
-+unlet s:sections
-+
- " A URL (using the domain name definitions from RFC 1034 and 1738), right now
- " only enforce protocol and some sanity on the server/path part;
- syn match debcontrolHTTPUrl contained "\vhttps?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
diff --git a/debian/patches/upstream/syntax-debcontrol.vim-Sync-up-with-deb-src-control-5.patch b/debian/patches/upstream/syntax-debcontrol.vim-Sync-up-with-deb-src-control-5.patch
deleted file mode 100644
index a70f49c..0000000
--- a/debian/patches/upstream/syntax-debcontrol.vim-Sync-up-with-deb-src-control-5.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From: James McCoy <jamessan at debian.org>
-Date: Thu, 26 Oct 2017 22:50:21 -0400
-Subject: syntax/debcontrol.vim: Sync up with deb-src-control(5)
-
-Added Rules-Requires-Root, Build-Essential, Build-Profiles, Tag,
-Subarchitecture, Kernel-Version, Installer-Menu-Item, Built-Using, and
-general handling for user-defined fields.
-
-Signed-off-by: James McCoy <jamessan at debian.org>
----
- runtime/syntax/debcontrol.vim | 31 +++++++++++++++++++++++++------
- 1 file changed, 25 insertions(+), 6 deletions(-)
-
-diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
-index 1131c9e..1b5d37d 100644
---- a/runtime/syntax/debcontrol.vim
-+++ b/runtime/syntax/debcontrol.vim
-@@ -3,7 +3,7 @@
- " Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
- " Former Maintainers: Gerfried Fuchs <alfie at ist.org>
- " Wichert Akkerman <wakkerma at debian.org>
--" Last Change: 2017 Aug 18
-+" Last Change: 2017 Oct 26
- " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
-
- " Standard syntax initialization
-@@ -42,6 +42,8 @@ syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/c
- syn match debcontrolPackageType contained "u\?deb"
- syn match debcontrolVariable contained "\${.\{-}}"
- syn match debcontrolDmUpload contained "\cyes"
-+syn match debcontrolYesNo contained "\%(yes\|no\)"
-+syn match debcontrolR3 contained "\<\%(no\|binary-targets\|[[:graph:]]\+/[[:graph:]]\+\%( \+[[:graph:]]\+/[[:graph:]]\+\)*\)\>"
-
- " A URL (using the domain name definitions from RFC 1034 and 1738), right now
- " only enforce protocol and some sanity on the server/path part;
-@@ -59,15 +61,28 @@ syn match debcontrolComment "^#.*$" contains=@Spell
-
- syn case ignore
-
--" List of all legal keys
--syn match debcontrolKey contained "^\%(Source\|Package\|Section\|Priority\|\%(XSBC-Original-\)\=Maintainer\|Uploaders\|Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|Standards-Version\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Essential\|Architecture\|Multi-Arch\|Description\|Bugs\|Origin\|X[SB]-Python-Version\|Homepage\|\(XS-\)\=Vcs-\(Browser\|Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\)\|\%(XC-\)\=Package-Type\|\%(XS-\)\=Testsuite\): *"
-+" List of all legal keys, in order, from deb-src-control(5)
-+" Source fields
-+syn match debcontrolKey contained "^\%(Source\|Maintainer\|Uploaders\|Standards-Version\|Description\|Homepage\|Bugs\|Rules-Requires-Root\): *"
-+syn match debcontrolKey contained "^\%(XS-\)\=Vcs-\%(Arch\|Bzr\|Cvs\|Darcs\|Git\|Hg\|Mtn\|Svn\|Browser\): *"
-+syn match debcontrolKey contained "^\%(Origin\|Section\|Priority\): *"
-+syn match debcontrolKey contained "^Build-\%(Depends\|Conflicts\)\%(-Arch\|-Indep\)\=: *"
-+
-+" Binary fields
-+syn match debcontrolKey contained "^\%(Package\%(-Type\)\=\|Architecture\|Build-Profiles\): *"
-+syn match debcontrolKey contained "^\%(\%(Build-\)\=Essential\|Multi-Arch\|Tag\): *"
-+syn match debcontrolKey contained "^\%(\%(Pre-\)\=Depends\|Recommends\|Suggests\|Breaks\|Enhances\|Replaces\|Conflicts\|Provides\|Built-Using\): *"
-+syn match debcontrolKey contained "^\%(Subarchitecture\|Kernel-Version\|Installer-Menu-Item\): *"
-+
-+" User-defined fields
-+syn match debcontrolKey contained "^X[SBC]\{0,3\}\%(-Private\)\=-[-a-zA-Z0-9]\+: *"
-
- syn match debcontrolDeprecatedKey contained "^\%(\%(XS-\)\=DM-Upload-Allowed\): *"
-
- " Fields for which we do strict syntax checking
- syn region debcontrolStrictField start="^Architecture" end="$" contains=debcontrolKey,debcontrolArchitecture,debcontrolSpace oneline
- syn region debcontrolStrictField start="^Multi-Arch" end="$" contains=debcontrolKey,debcontrolMultiArch oneline
--syn region debcontrolStrictField start="^\(Package\|Source\)" end="$" contains=debcontrolKey,debcontrolName oneline
-+syn region debcontrolStrictField start="^\%(Package\|Source\)" end="$" contains=debcontrolKey,debcontrolName oneline
- syn region debcontrolStrictField start="^Priority" end="$" contains=debcontrolKey,debcontrolPriority oneline
- syn region debcontrolStrictField start="^Section" end="$" contains=debcontrolKey,debcontrolSection oneline
- syn region debcontrolStrictField start="^\%(XC-\)\=Package-Type" end="$" contains=debcontrolKey,debcontrolPackageType oneline
-@@ -77,10 +92,12 @@ syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-Svn" end="$" contains=deb
- syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-Cvs" end="$" contains=debcontrolKey,debcontrolVcsCvs oneline keepend
- syn region debcontrolStrictField start="^\%(XS-\)\=Vcs-Git" end="$" contains=debcontrolKey,debcontrolVcsGit oneline keepend
- syn region debcontrolStrictField start="^\%(XS-\)\=DM-Upload-Allowed" end="$" contains=debcontrolDeprecatedKey,debcontrolDmUpload oneline
-+syn region debcontrolStrictField start="^Rules-Requires-Root" end="$" contains=debcontrolKey,debcontrolR3 oneline
-+syn region debcontrolStrictField start="^\%(Build-\)\=Essential" end="$" contains=debcontrolKey,debcontrolYesNo oneline
-
- " Catch-all for the other legal fields
--syn region debcontrolField start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Essential\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\|\%(XS-\)\=Testsuite\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
--syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Uploaders\|Description\):" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
-+syn region debcontrolField start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\|\%(XS-\)\=Testsuite\|Build-Profiles\|Tag\|Subarchitecture\|Kernel-Version\|Installer-Menu-Item\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
-+syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Breaks\|Enhances\|Replaces\|Conflicts\|Provides\|Built-Using\|Uploaders\|X[SBC]\{0,3\}\%(Private-\)\=-[-a-zA-Z0-9]\+\):" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
- syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment, at Spell
-
- " Associate our matches and regions with pretty colours
-@@ -102,6 +119,8 @@ hi def link debcontrolVcsCvs Identifier
- hi def link debcontrolVcsGit Identifier
- hi def link debcontrolHTTPUrl Identifier
- hi def link debcontrolDmUpload Identifier
-+hi def link debcontrolYesNo Identifier
-+hi def link debcontrolR3 Identifier
- hi def link debcontrolComment Comment
- hi def link debcontrolElse Special
-
diff --git a/debian/patches/upstream/test_search-WaitFor-g-lines-to-be-visible.patch b/debian/patches/upstream/test_search-WaitFor-g-lines-to-be-visible.patch
deleted file mode 100644
index 90354ac..0000000
--- a/debian/patches/upstream/test_search-WaitFor-g-lines-to-be-visible.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: James McCoy <jamessan at debian.org>
-Date: Fri, 3 Nov 2017 19:42:16 -0400
-Subject: test_search: WaitFor g:lines to be visible
-
-On slower systems, the arbitrary wait isn't long enough. Waiting for
-the desired behavior is more reliable.
-
-Signed-off-by: James McCoy <jamessan at debian.org>
----
- src/testdir/test_search.vim | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
-index 37661c3..a93ab05 100644
---- a/src/testdir/test_search.vim
-+++ b/src/testdir/test_search.vim
-@@ -480,13 +480,12 @@ func Test_search_cmdline8()
- return
- endif
- " Prepare buffer text
-- let lines = ['abb vim vim vi', 'vimvivim']
-- call writefile(lines, 'Xsearch.txt')
-+ let g:lines = ['abb vim vim vi', 'vimvivim']
-+ call writefile(g:lines, 'Xsearch.txt')
- let g:buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile', 'Xsearch.txt'], {'term_rows': 3})
-
-- call term_wait(g:buf, 200)
-- call assert_equal(lines[0], term_getline(g:buf, 1))
-- call assert_equal(lines[1], term_getline(g:buf, 2))
-+ call WaitFor('g:lines == [term_getline(g:buf, 1), term_getline(g:buf, 2)]')
-+ unlet g:lines
-
- call term_sendkeys(g:buf, ":set incsearch hlsearch\<cr>")
- call term_sendkeys(g:buf, ":14vsp\<cr>")
-@@ -610,9 +609,7 @@ func Test_search_cmdline_incsearch_highlight_attr()
- let g:lines = ['abb vim vim vi', 'vimvivim']
- call writefile(g:lines, 'Xsearch.txt')
- let g:buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile', 'Xsearch.txt'], {'term_rows': 3})
-- call WaitFor('g:lines[0] == term_getline(g:buf, 1)')
-- call assert_equal(g:lines[0], term_getline(g:buf, 1))
-- call assert_equal(g:lines[1], term_getline(g:buf, 2))
-+ call WaitFor('g:lines == [term_getline(g:buf, 1), term_getline(g:buf, 2)]')
- unlet g:lines
-
- " Get attr of normal(a0), incsearch(a1), hlsearch(a2) highlight
--
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