Merge branch 'master' into local_windows

This commit is contained in:
Nicholas Marriott
2026-08-17 14:06:34 +01:00
79 changed files with 2614 additions and 453 deletions

View File

@@ -1,4 +1,4 @@
/* $OpenBSD: options-table.c,v 1.239 2026/07/19 17:36:38 nicm Exp $ */
/* $OpenBSD: options-table.c,v 1.242 2026/07/27 08:03:01 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1431,6 +1431,15 @@ const struct options_table_entry options_table[] = {
.text = "Style of current line number in copy mode."
},
{ .name = "copy-mode-current-line-style",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.default_str = "default",
.flags = OPTIONS_TABLE_IS_STYLE,
.separator = ",",
.text = "Style of the line containing the cursor in copy mode."
},
{ .name = "copy-mode-line-number-style",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
@@ -1451,8 +1460,8 @@ const struct options_table_entry options_table[] = {
{ .name = "fill-character",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW,
.default_str = "",
.text = "Character used to fill unused parts of window."
.default_str = "#{?is_inside,#[bg=themedarkgrey] ,#[fg=themelightgrey]#[acs]~}",
.text = "Format used to fill unused parts of window."
},
{ .name = "main-pane-height",
@@ -1936,6 +1945,7 @@ const struct options_table_entry options_table[] = {
OPTIONS_TABLE_AFTER_HOOK("show-messages"),
OPTIONS_TABLE_AFTER_HOOK("show-options"),
OPTIONS_TABLE_AFTER_HOOK("split-window"),
OPTIONS_TABLE_AFTER_HOOK("swap-window"),
OPTIONS_TABLE_AFTER_HOOK("unbind-key"),
OPTIONS_TABLE_HOOK("alert-activity", "",
"Run when a window has activity."),