From 34e416667378a610943f614b97da9b865d622806 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 24 Aug 2019 03:04:08 -0400 Subject: vim-patch:8.0.1236: Mac features are confusing #10837 Problem: Mac features are confusing. Solution: Make feature names more consistent, add "osxdarwin". Rename feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes vim/vim#2178) https://github.com/vim/vim/commit/d057301b1f28736f094affa17b190244ad56e8d9 --- src/nvim/eval.c | 1 + src/nvim/macros.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 3d56522f79..1570af07d7 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -11241,6 +11241,7 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr) "mac", "macunix", "osx", + "osxdarwin", #endif "menu", "mksession", diff --git a/src/nvim/macros.h b/src/nvim/macros.h index 018985fad2..760f690e87 100644 --- a/src/nvim/macros.h +++ b/src/nvim/macros.h @@ -109,7 +109,7 @@ // MB_COPY_CHAR(f, t): copy one char from "f" to "t" and advance the pointers. // PTR2CHAR(): get character from pointer. -// Get the length of the character p points to +// Get the length of the character p points to, including composing chars. # 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)) -- cgit