Skip to content

Commit 83a2a80

Browse files
committed
patch 7.4.2118
Problem: Mac: can't build with tiny features. Solution: Don't define FEAT_CLIPBOARD unconditionally. (Kazunobu Kuriyama)
1 parent f2c4c39 commit 83a2a80

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,8 @@ static char *(features[]) =
758758

759759
static int included_patches[] =
760760
{ /* Add new patch number below this line */
761+
/**/
762+
2118,
761763
/**/
762764
2117,
763765
/**/

src/vim.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@
9898
# ifndef HAVE_CONFIG_H
9999
# define UNIX
100100
# endif
101-
# ifndef FEAT_CLIPBOARD
101+
# if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD)
102102
# define FEAT_CLIPBOARD
103-
# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE)
104-
# define FEAT_MOUSE
105-
# endif
103+
# endif
104+
# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE)
105+
# define FEAT_MOUSE
106106
# endif
107107
#endif
108108
#if defined(MACOS_X) || defined(MACOS_CLASSIC)

0 commit comments

Comments
 (0)