aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ennen <mike.ennen@gmail.com>2016-11-26 16:23:26 -0700
committerMichael Ennen <mike.ennen@gmail.com>2016-11-29 16:32:43 -0700
commitf94740097bc8309946c145f496592f4da6e4ce54 (patch)
tree03a92f3c7b928ee69f40f174ed3fcf1396d52d79
parentd2be11fbf21ee37d6ae86818f2c1790ecf8fecca (diff)
downloadrneovim-f94740097bc8309946c145f496592f4da6e4ce54.tar.gz
rneovim-f94740097bc8309946c145f496592f4da6e4ce54.tar.bz2
rneovim-f94740097bc8309946c145f496592f4da6e4ce54.zip
vim-patch:7.4.1738
Problem: Count for ":messages" depends on number of lines. Solution: Add ADDR_OTHER address type. https://github.com/vim/vim/commit/5d91646599a7b74310845e30a2a52ff197dc0ed7
-rw-r--r--src/nvim/ex_cmds.lua3
-rw-r--r--src/nvim/ex_cmds_defs.h1
-rw-r--r--src/nvim/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index 98530c04df..b056fff667 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -35,6 +35,7 @@ local ADDR_LOADED_BUFFERS = 3
local ADDR_BUFFERS = 4
local ADDR_TABS = 5
local ADDR_QUICKFIX = 6
+local ADDR_OTHER = 99
-- The following table is described in ex_cmds_defs.h file.
return {
@@ -1605,7 +1606,7 @@ return {
{
command='messages',
flags=bit.bor(EXTRA, TRLBAR, RANGE, CMDWIN),
- addr_type=ADDR_LINES,
+ addr_type=ADDR_OTHER,
func='ex_messages',
},
{
diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h
index 8148eb5cee..c6389a0c8b 100644
--- a/src/nvim/ex_cmds_defs.h
+++ b/src/nvim/ex_cmds_defs.h
@@ -73,6 +73,7 @@
#define ADDR_BUFFERS 4
#define ADDR_TABS 5
#define ADDR_QUICKFIX 6
+#define ADDR_OTHER 99
typedef struct exarg exarg_T;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index d64e68f66a..db4ca60ceb 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -706,7 +706,7 @@ static int included_patches[] = {
1741,
1740,
// 1739,
- // 1738,
+ 1738,
// 1737 NA
// 1736 NA
1735,