vim: Import v8.1.2297

chrisbra · chrisbra · commit 56181c39d1f5 · 2019-11-13T00:00:37.000+01:00
* 8.1.2297: the ex_vimgrep() function is too long
* 8.1.2296: text properties are not combined with syntax by default
* 8.1.2295: if buffer of popup is in another window cursorline sign shows
* 8.1.2294: cursor pos wrong with concealing and search causes a scroll
* 8.1.2293: join adds trailing space when second line is empty
diff --git a/gitlog.txt b/gitlog.txt
@@ -1 +1 @@
-* [8.1.2292](https://github.com/vim/vim/releases/tag/v8.1.2292): v:mouse_winid not set on click in popup window
+* [8.1.2297](https://github.com/vim/vim/releases/tag/v8.1.2297): the ex_vimgrep() function is too long\n* [8.1.2296](https://github.com/vim/vim/releases/tag/v8.1.2296): text properties are not combined with syntax by default\n* [8.1.2295](https://github.com/vim/vim/releases/tag/v8.1.2295): if buffer of popup is in another window cursorline sign shows\n* [8.1.2294](https://github.com/vim/vim/releases/tag/v8.1.2294): cursor pos wrong with concealing and search causes a scroll\n* [8.1.2293](https://github.com/vim/vim/releases/tag/v8.1.2293): join adds trailing space when second line is empty
diff --git a/vim b/vim
@@ -1 +1 @@
-Subproject commit d002e411c60a231b7c136a84422b3d9bf7b8b4df
+Subproject commit d6a98a3a9768568b668f91a53267b36f86b84466

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* [8.1.2292](https://github.com/vim/vim/releases/tag/v8.1.2292): v:mouse_winid not set on click in popup window`
	`1`	+* [8.1.2297](https://github.com/vim/vim/releases/tag/v8.1.2297): the ex_vimgrep() function is too long\n* [8.1.2296](https://github.com/vim/vim/releases/tag/v8.1.2296): text properties are not combined with syntax by default\n* [8.1.2295](https://github.com/vim/vim/releases/tag/v8.1.2295): if buffer of popup is in another window cursorline sign shows\n* [8.1.2294](https://github.com/vim/vim/releases/tag/v8.1.2294): cursor pos wrong with concealing and search causes a scroll\n* [8.1.2293](https://github.com/vim/vim/releases/tag/v8.1.2293): join adds trailing space when second line is empty