aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2011-07-04 08:22:37 +0000
committerTiago Cunha <tcunha@gmx.com>2011-07-04 08:22:37 +0000
commitfce026eb32292f412d4fda8cfc495da7b655e99d (patch)
treed7b359620ebe16e1369c43f94f671e17c8f054b0
parente097f0b4ee30352ef1ea37ef030838b634fdf27e (diff)
downloadrtmux-fce026eb32292f412d4fda8cfc495da7b655e99d.tar.gz
rtmux-fce026eb32292f412d4fda8cfc495da7b655e99d.tar.bz2
rtmux-fce026eb32292f412d4fda8cfc495da7b655e99d.zip
Sync OpenBSD patchset 928:
Include the existing window and session name in the prompt when renaming and add a new key binding ($) for rename session. From Tiago Cunha.
-rw-r--r--cmd-command-prompt.c5
-rw-r--r--key-bindings.c3
-rw-r--r--tmux.14
3 files changed, 10 insertions, 2 deletions
diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c
index 49a979ea..ba18cbc5 100644
--- a/cmd-command-prompt.c
+++ b/cmd-command-prompt.c
@@ -59,8 +59,13 @@ void
cmd_command_prompt_key_binding(struct cmd *self, int key)
{
switch (key) {
+ case '$':
+ self->args = args_create(1, "rename-session '%%'");
+ args_set(self->args, 'I', "#S");
+ break;
case ',':
self->args = args_create(1, "rename-window '%%'");
+ args_set(self->args, 'I', "#W");
break;
case '.':
self->args = args_create(1, "move-window -t '%%'");
diff --git a/key-bindings.c b/key-bindings.c
index d97ed5d9..d71fd521 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -1,4 +1,4 @@
-/* $Id: key-bindings.c,v 1.98 2011-01-07 14:45:34 tcunha Exp $ */
+/* $Id$ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -106,6 +106,7 @@ key_bindings_init(void)
{ '!', 0, &cmd_break_pane_entry },
{ '"', 0, &cmd_split_window_entry },
{ '#', 0, &cmd_list_buffers_entry },
+ { '$', 0, &cmd_command_prompt_entry },
{ '%', 0, &cmd_split_window_entry },
{ '&', 0, &cmd_confirm_before_entry },
{ '(', 0, &cmd_switch_client_entry },
diff --git a/tmux.1 b/tmux.1
index 6f5bc780..11feec1b 100644
--- a/tmux.1
+++ b/tmux.1
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 2 2011 $
+.Dd $Mdocdate: July 3 2011 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -237,6 +237,8 @@ Break the current pane out of the window.
Split the current pane into two, top and bottom.
.It #
List all paste buffers.
+.It $
+Rename the current session.
.It %
Split the current pane into two, left and right.
.It &