{
int idx;
- /*
- * 'scroll' defaults to half the window height. The stored default is zero,
- * which results in the actual value computed from the window height.
- */
+ // 'scroll' defaults to half the window height. The stored default is zero,
+ // which results in the actual value computed from the window height.
idx = findoption((char_u *)"scroll");
if (idx >= 0 && !(options[idx].flags & P_WAS_SET))
set_option_default(idx, OPT_LOCAL, p_cp);
comp_col();
- /*
- * 'window' is only for backwards compatibility with Vi.
- * Default is Rows - 1.
- */
+ // 'window' is only for backwards compatibility with Vi.
+ // Default is Rows - 1.
if (!option_was_set((char_u *)"window"))
p_window = Rows - 1;
set_number_default("window", Rows - 1);
// For DOS console the default is always black.
#if !((defined(MSWIN)) && !defined(FEAT_GUI))
- /*
- * If 'background' wasn't set by the user, try guessing the value,
- * depending on the terminal name. Only need to check for terminals
- * with a dark background, that can handle color.
- */
+ // If 'background' wasn't set by the user, try guessing the value,
+ // depending on the terminal name. Only need to check for terminals
+ // with a dark background, that can handle color.
idx = findoption((char_u *)"bg");
if (idx >= 0 && !(options[idx].flags & P_WAS_SET)
&& *term_bg_default() == 'd')
p = get_isolated_shell_name();
if (p != NULL)
{
- /*
- * Default for p_sp is "| tee", for p_srr is ">".
- * For known shells it is changed here to include stderr.
- */
+ // Default for p_sp is "| tee", for p_srr is ">".
+ // For known shells it is changed here to include stderr.
if ( fnamecmp(p, "csh") == 0
|| fnamecmp(p, "tcsh") == 0
# if defined(MSWIN) // also check with .exe extension
int idx1;
long val;
- /*
- * If GUI is (going to be) used, we can always set the window title and
- * icon name. Saves a bit of time, because the X11 display server does
- * not need to be contacted.
- */
+ // If GUI is (going to be) used, we can always set the window title and
+ // icon name. Saves a bit of time, because the X11 display server does
+ // not need to be contacted.
idx1 = findoption((char_u *)"title");
if (idx1 >= 0 && !(options[idx1].flags & P_WAS_SET))
{
int nextchar; // next non-white char after option name
len = 0;
- /*
- * The two characters after "t_" may not be alphanumeric.
- */
+ // The two characters after "t_" may not be alphanumeric.
if (arg[0] == 't' && arg[1] == '_' && arg[2] && arg[3])
len = 4;
else
if (opt_idx < 0 || varp == NULL)
return NULL; // "cannot happen"
- /*
- * ":set opt!": invert
- * ":set opt&": reset to default value
- * ":set opt<": reset to global value
- */
+ // ":set opt!": invert
+ // ":set opt&": reset to default value
+ // ":set opt<": reset to global value
if (nextchar == '!')
value = *(int *)(varp) ^ 1;
else if (nextchar == '&')
}
else
{
- /*
- * ":set invopt": invert
- * ":set opt" or ":set noopt": set or reset
- */
+ // ":set invopt": invert
+ // ":set opt" or ":set noopt": set or reset
if (nextchar != NUL && !VIM_ISWHITE(afterchar))
return e_trailing_characters;
if (prefix == PREFIX_INV)
}
}
- /*
- * Allow '=' and ':' for historical reasons (MSDOS command.com).
- * Allows only one '=' character per "set" command line. grrr. (jw)
- */
+ // Allow '=' and ':' for historical reasons (MSDOS command.com).
+ // Allows only one '=' character per "set" command line. grrr. (jw)
if (nextchar == '?'
|| (prefix == PREFIX_NONE
&& vim_strchr((char_u *)"=:&<", nextchar) == NULL
&& !(flags & P_BOOL)))
{
- /*
- * print value
- */
+ // print value
if (*did_show)
msg_putchar('\n'); // cursor below last one
else
if (STRNCMP(arg, "all", 3) == 0 && !ASCII_ISALPHA(arg[3])
&& !(opt_flags & OPT_MODELINE))
{
- /*
- * ":set all" show all options.
- * ":set all&" set all options to their default value.
- */
+ // ":set all" show all options.
+ // ":set all&" set all options to their default value.
arg += 3;
if (*arg == '&')
{
if (stopopteval)
break;
- /*
- * Advance to next argument.
- * - skip until a blank found, taking care of backslashes
- * - skip blanks
- * - skip one "=val" argument (for hidden options ":set gfn =xx")
- */
+ // Advance to next argument.
+ // - skip until a blank found, taking care of backslashes
+ // - skip blanks
+ // - skip one "=val" argument (for hidden options ":set gfn =xx")
for (i = 0; i < 2 ; ++i)
{
while (*arg != NUL && !VIM_ISWHITE(*arg))
int newval,
int opt_flags) // OPT_LOCAL and/or OPT_GLOBAL
{
- /*
- * The option values that are changed when 'bin' changes are
- * copied when 'bin is set and restored when 'bin' is reset.
- */
+ // The option values that are changed when 'bin' changes are
+ // copied when 'bin is set and restored when 'bin' is reset.
if (newval)
{
if (!oldval) // switched on
check_opt_wim();
// Parse default for 'listchars'.
- (void)set_chars_option(curwin, &curwin->w_p_lcs, TRUE);
+ (void)set_listchars_option(curwin, curwin->w_p_lcs, TRUE);
// Parse default for 'fillchars'.
- (void)set_chars_option(curwin, &curwin->w_p_fcs, TRUE);
+ (void)set_fillchars_option(curwin, curwin->w_p_fcs, TRUE);
#ifdef FEAT_CLIPBOARD
// Parse default for 'clipboard'
if (curwin->w_p_arab)
{
- /*
- * 'arabic' is set, handle various sub-settings.
- */
+ // 'arabic' is set, handle various sub-settings.
if (!p_tbidi)
{
// set rightleft mode
}
else
{
- /*
- * 'arabic' is reset, handle various sub-settings.
- */
+ // 'arabic' is reset, handle various sub-settings.
if (!p_tbidi)
{
// reset rightleft mode
if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0)
*(int *)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL) = value;
- /*
- * Handle side effects of changing a bool option.
- */
+ // Handle side effects of changing a bool option.
if (options[opt_idx].opt_did_set_cb != NULL)
{
optset_T args;
}
limit_screen_size();
- /*
- * If the screen (shell) height has been changed, assume it is the
- * physical screenheight.
- */
+ // If the screen (shell) height has been changed, assume it is the
+ // physical screenheight.
if (old_Rows != Rows || old_Columns != Columns)
{
// Changing the screen size is not allowed while updating the screen.
static short quick_tab[27] = {0, 0}; // quick access table
int is_term_opt;
- /*
- * For first call: Initialize the quick-access table.
- * It contains the index for the first option that starts with a certain
- * letter. There are 26 letters, plus the first "t_" option.
- */
+ // For first call: Initialize the quick-access table.
+ // It contains the index for the first option that starts with a certain
+ // letter. There are 26 letters, plus the first "t_" option.
if (quick_tab[1] == 0)
{
p = options[0].fullname;
}
}
- /*
- * Check for name starting with an illegal character.
- */
+ // Check for name starting with an illegal character.
if (arg[0] < 'a' || arg[0] > 'z')
return -1;
int modifiers;
char_u *arg = arg_arg;
- /*
- * Don't use get_special_key_code() for t_xx, we don't want it to call
- * add_termcap_entry().
- */
+ // Don't use get_special_key_code() for t_xx, we don't want it to call
+ // add_termcap_entry().
if (arg[0] == 't' && arg[1] == '_' && arg[2] && arg[3])
key = TERMCAP2KEY(arg[2], arg[3]);
else if (has_lt)
else
msg_puts_title(_("\n--- Options ---"));
- /*
- * Do the loop two times:
- * 1. display the short items
- * 2. display the long items (only strings and numbers)
- * When "opt_flags" has OPT_ONECOLUMN do everything in run 2.
- */
+ // Do the loop two times:
+ // 1. display the short items
+ // 2. display the long items (only strings and numbers)
+ // When "opt_flags" has OPT_ONECOLUMN do everything in run 2.
for (run = 1; run <= 2 && !got_int; ++run)
{
- /*
- * collect the items in items[]
- */
+ // collect the items in items[]
item_count = 0;
for (p = &options[0]; p->fullname != NULL; p++)
{
}
}
- /*
- * display the items
- */
+ // display the items
if (run == 1)
{
cols = (Columns + GAP - 3) / INC;
void
clear_termoptions(void)
{
- /*
- * Reset a few things before clearing the old options. This may cause
- * outputting a few things that the terminal doesn't understand, but the
- * screen will be cleared later, so this is OK.
- */
+ // Reset a few things before clearing the old options. This may cause
+ // outputting a few things that the terminal doesn't understand, but the
+ // screen will be cleared later, so this is OK.
mch_setmouse(FALSE); // switch mouse off
mch_restore_title(SAVE_RESTORE_BOTH); // restore window titles
#if defined(FEAT_XCLIPBOARD) && defined(FEAT_GUI)
break;
case PV_LCS:
clear_string_option(&((win_T *)from)->w_p_lcs);
- set_chars_option((win_T *)from, &((win_T *)from)->w_p_lcs, TRUE);
+ set_listchars_option((win_T *)from, ((win_T *)from)->w_p_lcs, TRUE);
redraw_later(UPD_NOT_VALID);
break;
case PV_FCS:
clear_string_option(&((win_T *)from)->w_p_fcs);
- set_chars_option((win_T *)from, &((win_T *)from)->w_p_fcs, TRUE);
+ set_fillchars_option((win_T *)from, ((win_T *)from)->w_p_fcs, TRUE);
redraw_later(UPD_NOT_VALID);
break;
case PV_VE:
fill_culopt_flags(NULL, wp);
check_colorcolumn(wp);
#endif
- set_chars_option(wp, &wp->w_p_lcs, TRUE);
- set_chars_option(wp, &wp->w_p_fcs, TRUE);
+ set_listchars_option(wp, wp->w_p_lcs, TRUE);
+ set_fillchars_option(wp, wp->w_p_fcs, TRUE);
}
static char_u *
int dont_do_help;
int did_isk = FALSE;
- /*
- * Skip this when the option defaults have not been set yet. Happens when
- * main() allocates the first buffer.
- */
+ // Skip this when the option defaults have not been set yet. Happens when
+ // main() allocates the first buffer.
if (p_cpo != NULL)
{
/*
save_p_isk = buf->b_p_isk;
buf->b_p_isk = NULL;
}
- /*
- * Always free the allocated strings. If not already initialized,
- * reset 'readonly' and copy 'fileformat'.
- */
+ // Always free the allocated strings. If not already initialized,
+ // reset 'readonly' and copy 'fileformat'.
if (!buf->b_p_initialized)
{
free_buf_options(buf, TRUE);
buf->b_p_lw = empty_option;
buf->b_p_menc = empty_option;
- /*
- * Don't copy the options set by ex_help(), use the saved values,
- * when going from a help buffer to a non-help buffer.
- * Don't touch these at all when BCO_NOHELP is used and going from
- * or to a help buffer.
- */
+ // Don't copy the options set by ex_help(), use the saved values,
+ // when going from a help buffer to a non-help buffer.
+ // Don't touch these at all when BCO_NOHELP is used and going from
+ // or to a help buffer.
if (dont_do_help)
{
buf->b_p_isk = save_p_isk;
}
}
- /*
- * When the options should be copied (ignoring BCO_ALWAYS), set the
- * flag that indicates that the options have been initialized.
- */
+ // When the options should be copied (ignoring BCO_ALWAYS), set the
+ // flag that indicates that the options have been initialized.
if (should_copy)
buf->b_p_initialized = TRUE;
}
}
}
- /*
- * Check terminal key codes, these are not in the option table
- */
+ // Check terminal key codes, these are not in the option table
if (xp->xp_context != EXPAND_BOOL_SETTINGS && num_normal == 0)
{
for (opt_idx = 0; (str = get_termcode(opt_idx)) != NULL; opt_idx++)
}
}
- /*
- * Check special key names.
- */
+ // Check special key names.
regmatch->rm_ic = TRUE; // ignore case here
for (opt_idx = 0; (str = get_key_name(opt_idx)) != NULL; opt_idx++)
{
if (*matches == NULL)
return FAIL;
- /*
- * For a terminal key code expand_option_idx is < 0.
- */
+ // For a terminal key code expand_option_idx is < 0.
if (expand_option_idx < 0)
{
var = find_termcode(expand_option_name + 2);
if (p_paste)
{
- /*
- * Paste switched from off to on.
- * Save the current values, so they can be restored later.
- */
+ // Paste switched from off to on.
+ // Save the current values, so they can be restored later.
if (!old_p_paste)
{
// save options for each buffer
#endif
}
- /*
- * Always set the option values, also when 'paste' is set when it is
- * already on.
- */
- // set options for each buffer
+ // Always set the option values, also when 'paste' is set when it is
+ // already on. Set options for each buffer.
FOR_ALL_BUFFERS(buf)
{
buf->b_p_tw = 0; // textwidth is 0
#endif
}
- /*
- * Paste switched from on to off: Restore saved values.
- */
+ // Paste switched from on to off: Restore saved values.
else if (old_p_paste)
{
// restore options for each buffer
return did_set_opt_flags(p_cmp, p_cmp_values, &cmp_flags, TRUE);
}
+/*
+ * The global 'listchars' or 'fillchars' option is changed.
+ */
+ static char *
+did_set_global_listfillchars(char_u *val, int opt_lcs, int opt_flags)
+{
+ char *errmsg = NULL;
+ char_u **local_ptr = opt_lcs ? &curwin->w_p_lcs : &curwin->w_p_fcs;
+
+ // only apply the global value to "curwin" when it does not have a
+ // local value
+ if (opt_lcs)
+ errmsg = set_listchars_option(curwin, val,
+ **local_ptr == NUL || !(opt_flags & OPT_GLOBAL));
+ else
+ errmsg = set_fillchars_option(curwin, val,
+ **local_ptr == NUL || !(opt_flags & OPT_GLOBAL));
+ if (errmsg != NULL)
+ return errmsg;
+
+ tabpage_T *tp;
+ win_T *wp;
+
+ // If the current window is set to use the global
+ // 'listchars'/'fillchars' value, clear the window-local value.
+ if (!(opt_flags & OPT_GLOBAL))
+ clear_string_option(local_ptr);
+ FOR_ALL_TAB_WINDOWS(tp, wp)
+ {
+ // If the current window has a local value need to apply it
+ // again, it was changed when setting the global value.
+ // If no error was returned above, we don't expect an error
+ // here, so ignore the return value.
+ if (opt_lcs)
+ {
+ if (*wp->w_p_lcs == NUL)
+ (void)set_listchars_option(wp, wp->w_p_lcs, TRUE);
+ }
+ else
+ {
+ if (*wp->w_p_fcs == NUL)
+ (void)set_fillchars_option(wp, wp->w_p_fcs, TRUE);
+ }
+ }
+
+ redraw_all_later(UPD_NOT_VALID);
+
+ return NULL;
+}
+
+/*
+ * The 'fillchars' option or the 'listchars' option is changed.
+ */
+ char *
+did_set_chars_option(optset_T *args)
+{
+ char *errmsg = NULL;
+
+ if ( args->os_varp == p_lcs // global 'listchars'
+ || args->os_varp == p_fcs) // global 'fillchars'
+ errmsg = did_set_global_listfillchars(args->os_varp,
+ args->os_varp == p_lcs,
+ args->os_flags);
+ else if (args->os_varp == curwin->w_p_lcs) // local 'listchars'
+ errmsg = set_listchars_option(curwin, args->os_varp, TRUE);
+ else if (args->os_varp == curwin->w_p_fcs) // local 'fillchars'
+ errmsg = set_fillchars_option(curwin, args->os_varp, TRUE);
+
+ return errmsg;
+}
+
/*
* The 'cinoptions' option is changed.
*/
args->os_errbuf);
}
-/*
- * The global 'listchars' or 'fillchars' option is changed.
- */
- static char *
-did_set_global_listfillchars(char_u **varp, int opt_flags)
-{
- char *errmsg = NULL;
- char_u **local_ptr = varp == &p_lcs
- ? &curwin->w_p_lcs : &curwin->w_p_fcs;
-
- // only apply the global value to "curwin" when it does not have a
- // local value
- errmsg = set_chars_option(curwin, varp,
- **local_ptr == NUL || !(opt_flags & OPT_GLOBAL));
- if (errmsg != NULL)
- return errmsg;
-
- tabpage_T *tp;
- win_T *wp;
-
- // If the current window is set to use the global
- // 'listchars'/'fillchars' value, clear the window-local value.
- if (!(opt_flags & OPT_GLOBAL))
- clear_string_option(local_ptr);
- FOR_ALL_TAB_WINDOWS(tp, wp)
- {
- // If the current window has a local value need to apply it
- // again, it was changed when setting the global value.
- // If no error was returned above, we don't expect an error
- // here, so ignore the return value.
- local_ptr = varp == &p_lcs ? &wp->w_p_lcs : &wp->w_p_fcs;
- if (**local_ptr == NUL)
- (void)set_chars_option(wp, local_ptr, TRUE);
- }
-
- redraw_all_later(UPD_NOT_VALID);
-
- return NULL;
-}
-
#if defined(CURSOR_SHAPE) || defined(PROTO)
/*
* The 'guicursor' option is changed.
|| varp == &p_tenc // 'termencoding'
|| gvarp == &p_menc) // 'makeencoding'
errmsg = did_set_encoding(varp, gvarp, opt_flags);
- else if ( varp == &p_lcs // global 'listchars'
- || varp == &p_fcs) // global 'fillchars'
- errmsg = did_set_global_listfillchars(varp, opt_flags);
- else if (varp == &curwin->w_p_lcs) // local 'listchars'
- errmsg = set_chars_option(curwin, varp, TRUE);
- else if (varp == &curwin->w_p_fcs) // local 'fillchars'
- errmsg = set_chars_option(curwin, varp, TRUE);
// terminal options
else if (istermoption_idx(opt_idx) && full_screen)
did_set_term_option(varp, &did_swaptcap);
/*
* Handle setting 'listchars' or 'fillchars'.
- * "varp" points to either the global or the window-local value.
+ * "val" points to either the global or the window-local value.
+ * "opt_lcs" is TRUE for "listchars" and FALSE for "fillchars".
* When "apply" is FALSE do not store the flags, only check for errors.
* Assume monocell characters.
* Returns error message, NULL if it's OK.
*/
- char *
-set_chars_option(win_T *wp, char_u **varp, int apply)
+ static char *
+set_chars_option(win_T *wp, char_u *val, int opt_lcs, int apply)
{
int round, i, len, len2, entries;
char_u *p, *s;
char_u *last_lmultispace = NULL; // Last occurrence of "leadmultispace:"
int multispace_len = 0; // Length of lcs-multispace string
int lead_multispace_len = 0; // Length of lcs-leadmultispace string
- int is_listchars = (varp == &p_lcs || varp == &wp->w_p_lcs);
- char_u *value = *varp;
+ int is_listchars = opt_lcs;
+ char_u *value = val;
struct charstab
{
tab = lcstab;
CLEAR_FIELD(lcs_chars);
entries = ARRAY_LENGTH(lcstab);
- if (varp == &wp->w_p_lcs && wp->w_p_lcs[0] == NUL)
- value = p_lcs; // local value is empty, us the global value
+ if (opt_lcs && wp->w_p_lcs[0] == NUL)
+ value = p_lcs; // local value is empty, use the global value
}
else
{
tab = filltab;
entries = ARRAY_LENGTH(filltab);
- if (varp == &wp->w_p_fcs && wp->w_p_fcs[0] == NUL)
+ if (!opt_lcs && wp->w_p_fcs[0] == NUL)
value = p_fcs; // local value is empty, us the global value
}
return NULL; // no error
}
+/*
+ * Handle the new value of 'fillchars'.
+ */
+ char *
+set_fillchars_option(win_T *wp, char_u *val, int apply)
+{
+ return set_chars_option(wp, val, FALSE, apply);
+}
+
+/*
+ * Handle the new value of 'listchars'.
+ */
+ char *
+set_listchars_option(win_T *wp, char_u *val, int apply)
+{
+ return set_chars_option(wp, val, TRUE, apply);
+}
+
/*
* Check all global and local values of 'listchars' and 'fillchars'.
* Return an untranslated error messages if any of them is invalid, NULL
tabpage_T *tp;
win_T *wp;
- if (set_chars_option(curwin, &p_lcs, FALSE) != NULL)
+ if (set_listchars_option(curwin, p_lcs, FALSE) != NULL)
return e_conflicts_with_value_of_listchars;
- if (set_chars_option(curwin, &p_fcs, FALSE) != NULL)
+ if (set_fillchars_option(curwin, p_fcs, FALSE) != NULL)
return e_conflicts_with_value_of_fillchars;
FOR_ALL_TAB_WINDOWS(tp, wp)
{
- if (set_chars_option(wp, &wp->w_p_lcs, FALSE) != NULL)
+ if (set_listchars_option(wp, wp->w_p_lcs, FALSE) != NULL)
return e_conflicts_with_value_of_listchars;
- if (set_chars_option(wp, &wp->w_p_fcs, FALSE) != NULL)
+ if (set_fillchars_option(wp, wp->w_p_fcs, FALSE) != NULL)
return e_conflicts_with_value_of_fillchars;
}
return NULL;
projects / vim / commitdiff