Merge #8526 from janlazo/vim-8.0.0451

1 files changed, 5 insertions, 11 deletions

diff --git a/src/nvim/macros.h b/src/nvim/macros.h
index 348df2d9b6..7eb58bea2a 100644
--- a/src/nvim/macros.h
+++ b/src/nvim/macros.h
@@ -82,12 +82,6 @@
     } \
   } while (0)
 
-/*
- * vim_isbreak() is used very often if 'linebreak' is set, use a macro to make
- * it work fast.
- */
-#define vim_isbreak(c) (breakat_flags[(char_u)(c)])
-
 #define WRITEBIN   "wb"        /* no CR-LF translation */
 #define READBIN    "rb"
 #define APPENDBIN  "ab"
@@ -110,9 +104,9 @@
 /* Whether to draw the vertical bar on the right side of the cell. */
 # define CURSOR_BAR_RIGHT (curwin->w_p_rl && (!(State & CMDLINE) || cmdmsg_rl))
 
-// mb_ptr_adv(): advance a pointer to the next character, taking care of
+// MB_PTR_ADV(): advance a pointer to the next character, taking care of
 // multi-byte characters if needed.
-// mb_ptr_back(): backup a pointer to the previous character, taking care of
+// MB_PTR_BACK(): backup a pointer to the previous character, taking care of
 // multi-byte characters if needed.
 // MB_COPY_CHAR(f, t): copy one char from "f" to "t" and advance the pointers.
 // PTR2CHAR(): get character from pointer.
@@ -120,11 +114,11 @@
 // Get the length of the character p points to
 # define MB_PTR2LEN(p)          mb_ptr2len(p)
 // Advance multi-byte pointer, skip over composing chars.
-# define mb_ptr_adv(p)      (p += mb_ptr2len((char_u *)p))
+# define MB_PTR_ADV(p)      (p += mb_ptr2len((char_u *)p))
 // Advance multi-byte pointer, do not skip over composing chars.
-# define mb_cptr_adv(p)     (p += utf_ptr2len(p))
+# define MB_CPTR_ADV(p)     (p += utf_ptr2len(p))
 // Backup multi-byte pointer. Only use with "p" > "s" !
-# define mb_ptr_back(s, p)  (p -= mb_head_off((char_u *)s, (char_u *)p - 1) + 1)
+# define MB_PTR_BACK(s, p)  (p -= mb_head_off((char_u *)s, (char_u *)p - 1) + 1)
 // get length of multi-byte char, not including composing chars
 # define MB_CPTR2LEN(p)     utf_ptr2len(p)