From c85f485aa78352f31421d209176b2ed57b91b86e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 6 Nov 2017 19:06:24 +0300
Subject: charset: Move vim_str2nr flags from vim.h to charset.h

---
 src/nvim/vim.h | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/nvim/vim.h')

diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 62ffc7433e..096c57450f 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -28,13 +28,6 @@
 /// length of a buffer to store a number in ASCII (64 bits binary + NUL)
 enum { NUMBUFLEN = 65 };
 
-// flags for vim_str2nr()
-#define STR2NR_BIN 1
-#define STR2NR_OCT 2
-#define STR2NR_HEX 4
-#define STR2NR_ALL (STR2NR_BIN + STR2NR_OCT + STR2NR_HEX)
-#define STR2NR_FORCE 8  // only when ONE of the above is used
-
 #define MAX_TYPENR 65535
 
 #define ROOT_UID 0
-- 
cgit 


From 6acbd76b004990701d9f4c29d9974b0a95e96cac Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Thu, 18 Jan 2018 01:49:42 +0100
Subject: Add completion for :checkhealth

---
 src/nvim/vim.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/nvim/vim.h')

diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index b535e380d1..b932c2d0f8 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -155,6 +155,7 @@ enum {
   EXPAND_USER_ADDR_TYPE,
   EXPAND_PACKADD,
   EXPAND_MESSAGES,
+  EXPAND_CHECKHEALTH,
 };
 
 
-- 
cgit 


From abed6a0b1a71e54b143e98678f4daa6818b02f8d Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 11 Feb 2018 13:46:35 +0100
Subject: vim-patch:8.0.1475: invalid memory access in read_redo()

Problem:    Invalid memory access in read_redo(). (gy741)
Solution:   Convert the replacement character back from a negative number to
            CR or NL. (hint by Dominique Pelle, closes vim/vim#2616)

https://github.com/vim/vim/commit/f12519dec88251305793f1651f558d16506b4be2
---
 src/nvim/vim.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/nvim/vim.h')

diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index b932c2d0f8..0c13d331c8 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -313,4 +313,8 @@ enum { FOLD_TEXT_LEN = 51 };  //!< buffer size for get_foldtext()
 # define OPEN_CHR_FILES
 #endif
 
+// Replacement for nchar used by nv_replace().
+#define REPLACE_CR_NCHAR    -1
+#define REPLACE_NL_NCHAR    -2
+
 #endif  // NVIM_VIM_H
-- 
cgit