vim: src/option.c comparison

updated for version 7.2-238

comparison

equal deleted inserted replaced

-:e753954c86e2
+:d92358c7d621
 */
 #define P_BOOL		0x01	/* the option is boolean */
 #define P_NUM		0x02	/* the option is numeric */
 #define P_STRING	0x04	/* the option is a string */
 #define P_ALLOCED	0x08	/* the string option is in allocated memory,
-				    must use vim_free() when assigning new
+				   must use free_string_option() when
-				    value. Not set if default is the same. */
+				   assigning new value. Not set if default is
+				   the same. */
 #define P_EXPAND	0x10	/* environment expansion.  NOTE: P_EXPAND can
 				   never be used for local or hidden options! */
 #define P_NODEFAULT	0x40	/* don't set to default value */
 #define P_DEF_ALLOCED	0x80	/* default value is in allocated memory, must
 				    use vim_free() when assigning new value */
 	}
 clear_termcodes();
 }
 /*
+* Free the string for one term option, if it was allocated.
+* Set the string to empty_option and clear allocated flag.
+* "var" points to the option value.
+*/
+void
+free_one_termoption(var)
+char_u *var;
+{
+struct vimoption   *p;
+for (p = &options[0]; p->fullname != NULL; p++)
+	if (p->var == var)
+	{
+	    if (p->flags & P_ALLOCED)
+		free_string_option(*(char_u **)(p->var));
+	    *(char_u **)(p->var) = empty_option;
+	    p->flags &= ~P_ALLOCED;
+	    break;
+	}
+}
+/*
 * Set the terminal option defaults to the current value.
 * Used after setting the terminal name.
 */
 void
 set_term_defaults()

Mercurial > vim