Merge and fix conflicts.

This commit is contained in:
Michael Grant
2026-10-10 10:16:38 +02:00
150 changed files with 8083 additions and 1084 deletions

View File

@@ -1,4 +1,4 @@
/* $OpenBSD: cmd-send-keys.c,v 1.81 2026/06/11 19:13:34 nicm Exp $ */
/* $OpenBSD: cmd-send-keys.c,v 1.82 2026/10/09 13:12:14 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -31,6 +31,7 @@ static enum cmd_retval cmd_send_keys_exec(struct cmd *, struct cmdq_item *);
const struct cmd_entry cmd_send_keys_entry = {
.name = "send-keys",
.description = "Send keys to a pane or client.",
.alias = "send",
.args = { "c:FHKlMN:Rt:X", 0, -1, NULL },
@@ -46,6 +47,7 @@ const struct cmd_entry cmd_send_keys_entry = {
const struct cmd_entry cmd_send_prefix_entry = {
.name = "send-prefix",
.description = "Send the prefix key to a pane.",
.alias = NULL,
.args = { "2t:", 0, 0, NULL },