Merging debian version 2:8.1.2244-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

13 files changed, 151 insertions, 30 deletions

diff --git a/debian/changelog b/debian/changelog
index 4adc04b..e897e13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+vim (2:8.1.2244-1) unstable; urgency=medium
+
+  * Merge upstream patch v8.1.2244
+    + syntax/debchangelog.vim: Highlight unsupported releases differently than
+      supported releases.  (Closes: #847933)
+    + "mouse" feature is now always enabled.
+    + Improve support for chorded mappings in xterm, when xterm's
+      modifyOtherKeys mode is enabled, c.f. :help modifyOtherKeys.
+  * Revert "Move /usr/bin/vim.* into /usr/libexec/vim/"
+    (Closes: #943328, #942225).  The change broke user preferences for
+    alternatives and sensible-editor.
+  * Add /var/lib/addons to 'runtimepath' at build time (Closes: #943967)
+  * Use dh_missing instead of dh_install --list-missing (Closes: #942277)
+
+ -- James McCoy <jamessan@debian.org>  Sun, 03 Nov 2019 20:52:36 -0500
+
 vim (2:8.1.2136-1~progress5+u1) engywuck-backports; urgency=medium
 
   * Initial upload to engywuck-backports.
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index 3327a89..7e223b1 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -2160,3 +2160,111 @@ Individual patches for Vim 8.1:
  14731  8.1.2134  modifier keys are not always recognized
   2576  8.1.2135  with modifyOtherKeys Alt-a does not work properly
   2341  8.1.2136  using freed memory with autocmd from fuzzer
+  2672  8.1.2137  parsing the termresponse is not tested
+  3118  8.1.2138  including the build number in the Win32 binary is confusing
+  3188  8.1.2139  the modifyOtherKeys codes are not tested
+  5477  8.1.2140  "gk" and "gj" do not work correctly in number column
+  4340  8.1.2141  :tselect has an extra hit-enter prompt
+  3444  8.1.2142  some key mappings do not work with modifyOtherKeys
+  6557  8.1.2143  cannot see each command even when 'verbose' is set
+  8483  8.1.2144  side effects when using t_ti to enable modifyOtherKeys
+ 54830  8.1.2145  cannot map <C-H> when modifyOtherKeys is enabled
+  1553  8.1.2146  build failure
+  1501  8.1.2147  crash when allocating memory fails
+  4718  8.1.2148  no test for right click extending Visual area
+  5648  8.1.2149  crash when running out of memory very early
+  3350  8.1.2150  no test for 'ttymouse' set from xterm version response
+  1520  8.1.2151  state test is a bit flaky
+  2652  8.1.2152  problems navigating tags file on MacOS Catalina
+ 10554  8.1.2153  combining text property and syntax highlight is wrong
+  2305  8.1.2154  quickfix window height wrong when there is a tabline
+  5286  8.1.2155  in a terminal window 'cursorlineopt' does not work properly
+  5299  8.1.2156  first character after Tab is not highlighted
+  1854  8.1.2157  libvterm source files missing from distribution
+  4562  8.1.2158  terminal attributes missing in Terminal-normal mode
+  3885  8.1.2159  some mappings are listed twice
+  1941  8.1.2160  cannot build with +syntax but without +terminal
+  2114  8.1.2161  mapping test fails
+  1666  8.1.2162  popup resize test is flaky
+  1727  8.1.2163  cannot build with +spell but without +syntax
+  5585  8.1.2164  stuck when using "j" in a popupwin with popup_filter_menu
+  1390  8.1.2165  mapping test fails on Mac
+  2124  8.1.2166  rubyeval() not tested as a method
+  1470  8.1.2167  mapping test fails on MS-Windows
+  2195  8.1.2168  heredoc assignment not skipped in if block
+  2148  8.1.2169  terminal flags are never reset
+  1386  8.1.2170  cannot build without the +termresponse feature
+ 63481  8.1.2171  mouse support not always available
+  4307  8.1.2172  spell highlight is wrong at start of the line
+ 24357  8.1.2173  searchit() has too many arguments
+  7447  8.1.2174  screen not recognized as supporting "sgr" mouse codes
+  3449  8.1.2175  meson files are not recognized
+  6107  8.1.2176  syntax attributes not combined with Visual highlighting
+  1907  8.1.2177  Dart files are not recognized
+  2483  8.1.2178  accessing uninitialized memory in test
+  3144  8.1.2179  pressing "q" at the more prompt doesn't stop Python output
+  4304  8.1.2180  Error E303 is not useful when 'directory' is empty
+  6819  8.1.2181  highlighting wrong when item follows tab
+  2134  8.1.2182  test42 seen as binary by git diff
+  1673  8.1.2183  running a test is a bit verbose
+ 16336  8.1.2184  option context is not copied when splitting a window
+  2134  8.1.2185  syntax test fails
+  1794  8.1.2186  cannot build without the +eval feature
+  1794  8.1.2187  error for bad regexp even though regexp is not used
+  1410  8.1.2188  build error for missing define
+  3912  8.1.2189  syntax highlighting wrong for tab
+  3812  8.1.2190  syntax test fails on Mac
+  2646  8.1.2191  when using modifyOtherKeys CTRL-X mode may not work
+ 23015  8.1.2192  cannot easily fill the info popup asynchronously
+  4357  8.1.2193  popup_setoptions(popup_getoptions()) does not work
+  4809  8.1.2194  modifyOtherKeys is not enabled by default
+  7453  8.1.2195  Vim does not exit when the terminal window is last window
+  4857  8.1.2196  MS-Windows: running tests with MSVC lacks updates
+  4070  8.1.2197  ExitPre autocommand may cause accessing freed memory
+  3470  8.1.2198  crash when using :center in autocommand
+  1752  8.1.2199  build failure when using normal features without GUI
+  2374  8.1.2200  crash when memory allocation fails
+  2245  8.1.2201  cannot build with dynamically linked Python 3.8
+  1893  8.1.2202  MS-Windows: build failure with GUI and small features
+  3644  8.1.2203  running libvterm tests without the +terminal feature
+  1522  8.1.2204  crash on exit when closing terminals
+ 39756  8.1.2205  sign entry structure has confusing name
+  2478  8.1.2206  no test for fixed issue #3893
+  9586  8.1.2207  "gn" doesn't work quite right
+  2447  8.1.2208  Unix: Tabs in output might be expanded to spaces
+  4398  8.1.2209  LF in escape codes may be expanded to CR-LF
+  9844  8.1.2210  using negative offset for popup_create() does not work
+  3426  8.1.2211  listener callback "added" argument is not the total
+  8559  8.1.2212  cannot see the selection type in :reg output
+  3431  8.1.2213  popup_textprop tests fail
+ 13145  8.1.2214  too much is redrawn when 'cursorline' is set
+  2053  8.1.2215  unreachable code in adjusting text prop columns
+  3980  8.1.2216  text property in wrong place after :substitute
+  1831  8.1.2217  compiler warning for unused variable
+  2929  8.1.2218  "gN" is off by one in Visual mode
+  5197  8.1.2219  no autocommand for open window with terminal
+  4507  8.1.2220  :cfile does not abort like other quickfix commands
+  8801  8.1.2221  cannot filter :disp output
+  1690  8.1.2222  accessing invalid memory
+  1844  8.1.2223  cannot see what buffer an ml_get error is for
+  1745  8.1.2224  cannot build Amiga version
+ 19596  8.1.2225  the "last used" info of a buffer is under used
+  5720  8.1.2226  cannot use system copy/paste in non-xterm terminals
+  6527  8.1.2227  layout wrong if 'lines' changes while cmdline window is open
+  2204  8.1.2228  screenpos() returns wrong values when 'number' is set
+ 11264  8.1.2229  cannot color number column above/below cursor differently
+  6199  8.1.2230  MS-Windows: testing external commands can be improved
+  6780  8.1.2231  not easy to move to the middle of a text line
+  1679  8.1.2232  MS-Windows: compiler warning for int size
+  5314  8.1.2233  cannot get the Vim command line arguments
+  3937  8.1.2234  get_short_pathname() fails depending on encoding
+  1960  8.1.2235  "C" with 'virtualedit' set does not include multi-byte char
+  2206  8.1.2236  ml_get error if pattern matches beyond last line
+  2197  8.1.2237  mode() result depends on whether CURSOR_SHAPE is defined
+  3350  8.1.2238  error in docs tags goes unnoticed
+  1950  8.1.2239  CI fails when running tests without building Vim
+ 15583  8.1.2240  popup window width changes when scrolling
+  8452  8.1.2241  match highlight does not combine with 'wincolor'
+  1946  8.1.2242  creating docs tags uses user preferences
+ 28309  8.1.2243  typos in comments
+  3542  8.1.2244  'wrapscan' is not used for "gn"
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 7312a8b..c3de560 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@debian.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
-index cb65535..5f2933d 100644
+index 805a052..05d4ff8 100644
 --- a/runtime/doc/options.txt
 +++ b/runtime/doc/options.txt
-@@ -5117,7 +5117,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5128,7 +5128,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 896d171..9e9ed91 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@debian.org>
  3 files changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/src/main.c b/src/main.c
-index 33ac89c..7a94caf 100644
+index 2ec5c26..e3a48b4 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -1952,6 +1952,10 @@ parse_command_name(mparm_T *parmp)
+@@ -1949,6 +1949,10 @@ parse_command_name(mparm_T *parmp)
      }
      else if (STRNICMP(initstr, "vim", 3) == 0)
  	initstr += 3;
@@ -31,7 +31,7 @@ index 33ac89c..7a94caf 100644
  
      // Catch "[r][g]vimdiff" and "[r][g]viewdiff".
      if (STRICMP(initstr, "diff") == 0)
-@@ -3206,7 +3210,12 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3203,7 +3207,12 @@ source_startup_scripts(mparm_T *parmp)
  	 * Get system wide defaults, if the file name is defined.
  	 */
  #ifdef SYS_VIMRC_FILE
@@ -45,7 +45,7 @@ index 33ac89c..7a94caf 100644
  #endif
  #ifdef MACOS_X
  	(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
-@@ -3241,6 +3250,9 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3238,6 +3247,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
@@ -70,10 +70,10 @@ index 618c0e9..1c21c57 100644
  # define SYS_VIMRC_FILE "$VIM/vimrc"
  #endif
 diff --git a/src/structs.h b/src/structs.h
-index 2d7c4fd..b69cbca 100644
+index 124b059..db32a53 100644
 --- a/src/structs.h
 +++ b/src/structs.h
-@@ -3704,6 +3704,9 @@ typedef struct
+@@ -3705,6 +3705,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 ace9c13..d8e074f 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
@@ -37,7 +37,7 @@ index f9ae0bb..0929e28 100644
  #undef HAVE_ATTRIBUTE_UNUSED
  
 diff --git a/src/configure.ac b/src/configure.ac
-index 3ad223b..7fa71ea 100644
+index b59914b..9aa3b4d 100644
 --- a/src/configure.ac
 +++ b/src/configure.ac
 @@ -62,6 +62,16 @@ if test x"$ac_cv_prog_cc_c99" != xno; then
@@ -58,7 +58,7 @@ index 3ad223b..7fa71ea 100644
  
  AC_MSG_CHECKING(--enable-fail-if-missing argument)
 diff --git a/src/version.c b/src/version.c
-index 46bd1b1..87cc46b 100644
+index 5f009e3..de6e6ac 100644
 --- a/src/version.c
 +++ b/src/version.c
 @@ -44,9 +44,13 @@ init_longVersion(void)
diff --git a/debian/rules b/debian/rules
index f04396e..1d19808 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ CFGFLAGS = --prefix=/usr --mandir='$${prefix}'/share/man --without-local-dir
 CFGFLAGS += --with-modified-by="$(BUILDER)"
 CFGFLAGS += --with-compiledby="$(BUILDER)"
 CFGFLAGS += --enable-fail-if-missing
-CFGFLAGS += --with-global-runtime='/etc/vim,$$VIM/vimfiles'
+CFGFLAGS += --with-global-runtime='/var/lib/vim/addons,/etc/vim,$$VIM/vimfiles'
 
 TINYFLAGS:=--with-features=small
 TINYFLAGS+=--disable-gui
@@ -141,7 +141,6 @@ DOT_IN_DEPS := debian/vim-common.install
 DOT_IN_DEPS += debian/vim-runtime.links
 DOT_IN_DEPS += debian/vim-runtime.postrm
 DOT_IN_DEPS += debian/vim-runtime.preinst
-DOT_IN_DEPS += debian/runtime/debian.vim
 DOT_IN_DEPS_TINY := debian/tiny/vimrc.tiny
 
 # nothing to do per default
@@ -297,7 +296,7 @@ install-indep-stamp: build-vim-basic-stamp build-indep-stamp $(DOT_IN_DEPS)
 	cp debian/vim-common/usr/share/pixmaps/gvim.svg \
 	   debian/vim-common/usr/share/icons/hicolor/scalable/apps/gvim.svg
 
-	dh_install --list-missing
+	dh_install
 	# adjust things for vim-gui-common
 	cp debian/vim-common/usr/share/man/man1/vim.1 \
 	   debian/vim-gui-common/usr/share/man/man1/gvim.1
@@ -322,6 +321,7 @@ install-indep-stamp: build-vim-basic-stamp build-indep-stamp $(DOT_IN_DEPS)
 	dh_installchangelogs debian/changelog.upstream
 	dh_installdocs
 	dh_installmime
+	dh_missing --list-missing
 	touch $@
 
 install-xxd-stamp: export DH_OPTIONS=-pxxd
@@ -376,11 +376,12 @@ install-%-stamp: build-%-stamp
 	  echo "debian/tiny/doc/	usr/share/vim/$(VIMCUR)" >> debian/vim-tiny.install; \
 	  echo "debian/tiny/vimrc.tiny	etc/vim" >> debian/vim-tiny.install; \
 	fi
-	dh_install --list-missing
+	dh_install
 	dh_installchangelogs debian/changelog.upstream
 	dh_installdocs
 	dh_link
 	dh_bugfiles -A
+	dh_missing --list-missing
 
 	touch $@
 
diff --git a/debian/runtime/debian.vim.in b/debian/runtime/debian.vim
index a47122b..0856148 100644
--- a/debian/runtime/debian.vim.in
+++ b/debian/runtime/debian.vim
@@ -1,7 +1,3 @@
-" Debian system-wide default configuration Vim
-
-set runtimepath=~/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/@VIMCUR@,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,~/.vim/after
-
 " Normally we use vim-extensions. If you want true vi-compatibility
 " remove change the following statements
 set nocompatible	" Use Vim defaults instead of 100% vi compatibility
diff --git a/debian/runtime/vimrc b/debian/runtime/vimrc
index f2a1ee6..c93564d 100644
--- a/debian/runtime/vimrc
+++ b/debian/runtime/vimrc
@@ -5,8 +5,6 @@
 " It is recommended to make changes after sourcing debian.vim since it alters
 " the value of the 'compatible' option.
 
-" This line should not be removed as it ensures that various options are
-" properly set to work with the Vim-related packages available in Debian.
 runtime! debian.vim
 
 " Vim will load $VIMRUNTIME/defaults.vim if the user does not have a vimrc.
diff --git a/debian/tests/variants b/debian/tests/variants
index 9b85644..71e4164 100755
--- a/debian/tests/variants
+++ b/debian/tests/variants
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 
-for variant in /usr/libexec/vim/vim.*
+for variant in /usr/bin/vim.*
 do
   $variant "$@"
 done
diff --git a/debian/vim-variant.install b/debian/vim-variant.install
index 5f860fc..5bd6ff2 100644
--- a/debian/vim-variant.install
+++ b/debian/vim-variant.install
@@ -1 +1 @@
-src/vim-@VARIANT@/vim.@VARIANT@ usr/libexec/vim/
+src/vim-@VARIANT@/vim.@VARIANT@	usr/bin/
diff --git a/debian/vim-variant.lintian-overrides b/debian/vim-variant.lintian-overrides
new file mode 100644
index 0000000..066e561
--- /dev/null
+++ b/debian/vim-variant.lintian-overrides
@@ -0,0 +1,2 @@
+# vim.xxx files are alternatives for (g)vim, which has a manpage in vim(-gui)-common
+@PKG@ binary: binary-without-manpage usr/bin/vim.@VARIANT@
diff --git a/debian/vim-variant.postinst b/debian/vim-variant.postinst
index c89f48a..de433d2 100644
--- a/debian/vim-variant.postinst
+++ b/debian/vim-variant.postinst
@@ -10,16 +10,16 @@ mandir=/usr/share/man
 
 add_variant_alternative () {
   if [ "$variant" != "tiny" ]; then
-    update-alternatives --install /usr/bin/vim vim /usr/libexec/vim/vim.$variant $1
-    update-alternatives --install /usr/bin/vimdiff vimdiff /usr/libexec/vim/vim.$variant $1
-    update-alternatives --install /usr/bin/rvim rvim /usr/libexec/vim/vim.$variant $1
+    update-alternatives --install /usr/bin/vim vim /usr/bin/vim.$variant $1
+    update-alternatives --install /usr/bin/vimdiff vimdiff /usr/bin/vim.$variant $1
+    update-alternatives --install /usr/bin/rvim rvim /usr/bin/vim.$variant $1
   fi
-  update-alternatives --install /usr/bin/rview rview /usr/libexec/vim/vim.$variant $1
+  update-alternatives --install /usr/bin/rview rview /usr/bin/vim.$variant $1
   # Since other packages provide these commands, we'll setup alternatives for
   # their manpages, too.
   for i in vi view ex editor ; do
     update-alternatives \
-      --install /usr/bin/$i $i /usr/libexec/vim/vim.$variant $1 \
+      --install /usr/bin/$i $i /usr/bin/vim.$variant $1 \
       @LANG_ALTS@
       --slave $mandir/man1/$i.1.gz $i.1.gz \
               $mandir/man1/vim.1.gz
@@ -33,7 +33,7 @@ add_variant_alternative () {
 
 add_gui_variant_alternative () {
   for i in gvim gview rgview rgvim evim eview gvimdiff ; do
-    update-alternatives --install /usr/bin/$i $i /usr/libexec/vim/vim.$variant $1
+    update-alternatives --install /usr/bin/$i $i /usr/bin/vim.$variant $1
   done
 }
 
diff --git a/debian/vim-variant.prerm b/debian/vim-variant.prerm
index 6c46631..0d7fb68 100644
--- a/debian/vim-variant.prerm
+++ b/debian/vim-variant.prerm
@@ -8,7 +8,7 @@ variant=@VARIANT@
 
 remove_variant_alternative () {
   for i in vi view ex editor rvim rview vimdiff vim; do
-    update-alternatives --remove $i /usr/libexec/vim/vim.$variant
+    update-alternatives --remove $i /usr/bin/vim.$variant
   done
   case "$variant" in
     gtk|gtk3|athena) # gui enabled variants
@@ -19,7 +19,7 @@ remove_variant_alternative () {
 
 remove_gui_variant_alternative () {
   for i in eview evim gview gvimdiff rgview rgvim gvim; do
-    update-alternatives --remove $i /usr/libexec/vim/vim.$variant
+    update-alternatives --remove $i /usr/bin/vim.$variant
   done
 }