Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4621
Modified Files:
cmd-command-prompt.c cmd.c key-bindings.c tmux.1 tmux.h
Removed Files:
cmd-select-prompt.c
Log Message:
Sync OpenBSD patchset 697:
Identical behaviour to select-prompt can now be obtained with
command-prompt, so remove select-prompt and change ' to be bound to
command-prompt -p index "select-window -t :%%".
Index: cmd.c
===================================================================
RCS file: /cvsroot/tmux/tmux/cmd.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- cmd.c 15 Mar 2010 22:03:38 -0000 1.138
+++ cmd.c 14 May 2010 14:33:39 -0000 1.139
@@ -84,7 +84,6 @@
&cmd_save_buffer_entry,
&cmd_select_layout_entry,
&cmd_select_pane_entry,
- &cmd_select_prompt_entry,
&cmd_select_window_entry,
&cmd_send_keys_entry,
&cmd_send_prefix_entry,
--- cmd-select-prompt.c DELETED ---
Index: tmux.1
===================================================================
RCS file: /cvsroot/tmux/tmux/tmux.1,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- tmux.1 14 May 2010 14:19:41 -0000 1.248
+++ tmux.1 14 May 2010 14:33:39 -0000 1.249
@@ -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: May 2 2010 $
+.Dd $Mdocdate: May 5 2010 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -1265,7 +1265,7 @@
keys, quotation marks are necessary, for example:
.Bd -literal -offset indent
bind-key '"' split-window
-bind-key "'" select-prompt
+bind-key "'" new-window
.Ed
.Pp
Commands related to key bindings are as follows:
@@ -2316,10 +2316,6 @@
is as for
.Ic status-left ,
with the exception that #() are not handled.
-.It Ic select-prompt Op Fl t Ar target-client
-Open a prompt inside
-.Ar target-client
-allowing a window index to be entered interactively.
.El
.Sh BUFFERS
.Nm
Index: cmd-command-prompt.c
===================================================================
RCS file: /cvsroot/tmux/tmux/cmd-command-prompt.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cmd-command-prompt.c 14 Nov 2009 17:56:39 -0000 1.27
+++ cmd-command-prompt.c 14 May 2010 14:33:39 -0000 1.28
@@ -81,6 +81,10 @@
case 'f':
data->template = xstrdup("find-window '%%'");
break;
+ case '\'':
+ data->template = xstrdup("select-window -t ':%%'");
+ data->prompts = xstrdup("index");
+ break;
}
}
Index: tmux.h
===================================================================
RCS file: /cvsroot/tmux/tmux/tmux.h,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -d -r1.556 -r1.557
--- tmux.h 14 May 2010 14:30:01 -0000 1.556
+++ tmux.h 14 May 2010 14:33:39 -0000 1.557
@@ -1494,7 +1494,6 @@
extern const struct cmd_entry cmd_save_buffer_entry;
extern const struct cmd_entry cmd_select_layout_entry;
extern const struct cmd_entry cmd_select_pane_entry;
-extern const struct cmd_entry cmd_select_prompt_entry;
extern const struct cmd_entry cmd_select_window_entry;
extern const struct cmd_entry cmd_send_keys_entry;
extern const struct cmd_entry cmd_send_prefix_entry;
Index: key-bindings.c
===================================================================
RCS file: /cvsroot/tmux/tmux/key-bindings.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- key-bindings.c 14 May 2010 14:16:37 -0000 1.91
+++ key-bindings.c 14 May 2010 14:33:39 -0000 1.92
@@ -125,7 +125,7 @@
{ '?', 0, &cmd_list_keys_entry },
{ 'D', 0, &cmd_choose_client_entry },
{ '[', 0, &cmd_copy_mode_entry },
- { '\'', 0, &cmd_select_prompt_entry },
+ { '\'', 0, &cmd_command_prompt_entry },
{ '\002', /* C-b */ 0, &cmd_send_prefix_entry },
{ '\017', /* C-o */ 0, &cmd_rotate_window_entry },
{ '\032', /* C-z */ 0, &cmd_suspend_client_entry },
------------------------------------------------------------------------------
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
