Move columnspace under FEAT_GUI_MACVIM

Author: splhack

src/option.c

@@ -856,7 +856,7 @@ static struct vimoption options[] =
 			    (char_u *)&Columns, PV_NONE,
 			    {(char_u *)80L, (char_u *)0L} SCRIPTID_INIT},
     {"columnspace",   "csp",  P_NUM|P_VI_DEF|P_RCLR,
-#ifdef FEAT_GUI
+#ifdef FEAT_GUI_MACVIM
 			    (char_u *)&p_columnspace, PV_NONE,
 #else
 			    (char_u *)NULL, PV_NONE,
@@ -8992,7 +8992,7 @@ set_num_option(
     }
 #endif
 
-#ifdef FEAT_GUI
+#ifdef FEAT_GUI_MACVIM
     else if (pp == &p_columnspace)
     {
 	/* Recompute gui.char_width and resize the Vim window to keep the

src/option.h

@@ -623,7 +623,6 @@ EXTERN char_u	*p_lm;		/* 'langmenu' */
 #endif
 #ifdef FEAT_GUI
 EXTERN long	p_linespace;	/* 'linespace' */
-EXTERN long	p_columnspace;	/* 'columnspace' */
 #endif
 #ifdef FEAT_LISP
 EXTERN char_u	*p_lispwords;	/* 'lispwords' */
@@ -645,6 +644,7 @@ EXTERN int	p_macatsui;	/* 'macatsui' */
 #ifdef FEAT_GUI_MACVIM
 EXTERN int	p_macligatures;	/* 'macligatures' */
 EXTERN int	p_macthinstrokes;	/* 'macthinstrokes' */
+EXTERN long	p_columnspace;	/* 'columnspace' */
 #endif
 EXTERN int	p_magic;	/* 'magic' */
 #ifdef FEAT_MBYTE