Minor Nazi style tweaks to previous, and man page rephrasery.

This commit is contained in:
Nicholas Marriott 2010-03-16 17:51:32 +00:00
parent 009d8d2ea7
commit 33a90efc93
2 changed files with 17 additions and 16 deletions

18
tmux.1
View File

@ -1,4 +1,4 @@
.\" $Id: tmux.1,v 1.239 2010-03-16 17:30:58 micahcowan Exp $ .\" $Id: tmux.1,v 1.240 2010-03-16 17:51:32 nicm Exp $
.\" .\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\" .\"
@ -671,14 +671,16 @@ The three next and previous space keys work similarly but use a space alone as
the word separator. the word separator.
.Pp .Pp
The jump commands enable quick movement within a line. The jump commands enable quick movement within a line.
For instance, with the default bindings (in either vi or emacs mode), For instance, typing
you can type .Ql f
.Ql f/ , followed by
and the cursor will jump to the next slash character on the current line. .Ql /
You can then type will move the cursor to the next
.Ql /
character on the current line.
A
.Ql \&; .Ql \&;
to cause the cursor to jump to the next occurrence of a slash. will then jump to the next occurrence.
(These are based on vi editor commands.)
.Pp .Pp
Commands in copy mode may be prefaced by an optional repeat count. Commands in copy mode may be prefaced by an optional repeat count.
With vi key bindings, a prefix is entered using the number keys; with With vi key bindings, a prefix is entered using the number keys; with

View File

@ -1,4 +1,4 @@
/* $Id: window-copy.c,v 1.111 2010-03-16 17:30:58 micahcowan Exp $ */ /* $Id: window-copy.c,v 1.112 2010-03-16 17:51:32 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -258,10 +258,10 @@ window_copy_key(struct window_pane *wp, struct client *c, int key)
if ((key & 0xff00) == 0) { if ((key & 0xff00) == 0) {
data->jumpchar = key; data->jumpchar = key;
if (data->inputtype == WINDOW_COPY_JUMPFORWARD) { if (data->inputtype == WINDOW_COPY_JUMPFORWARD) {
for ( ; np != 0; np--) for (; np != 0; np--)
window_copy_cursor_jump(wp); window_copy_cursor_jump(wp);
} else { } else {
for ( ; np != 0; np--) for (; np != 0; np--)
window_copy_cursor_jump_back(wp); window_copy_cursor_jump_back(wp);
} }
} }
@ -442,19 +442,19 @@ window_copy_key(struct window_pane *wp, struct client *c, int key)
return; /* skip numprefix reset */ return; /* skip numprefix reset */
case MODEKEYCOPY_JUMPAGAIN: case MODEKEYCOPY_JUMPAGAIN:
if (data->jumptype == WINDOW_COPY_JUMPFORWARD) { if (data->jumptype == WINDOW_COPY_JUMPFORWARD) {
for ( ; np != 0; np--) for (; np != 0; np--)
window_copy_cursor_jump(wp); window_copy_cursor_jump(wp);
} else if (data->jumptype == WINDOW_COPY_JUMPBACK) { } else if (data->jumptype == WINDOW_COPY_JUMPBACK) {
for ( ; np != 0; np--) for (; np != 0; np--)
window_copy_cursor_jump_back(wp); window_copy_cursor_jump_back(wp);
} }
break; break;
case MODEKEYCOPY_JUMPREVERSE: case MODEKEYCOPY_JUMPREVERSE:
if (data->jumptype == WINDOW_COPY_JUMPFORWARD) { if (data->jumptype == WINDOW_COPY_JUMPFORWARD) {
for ( ; np != 0; np--) for (; np != 0; np--)
window_copy_cursor_jump_back(wp); window_copy_cursor_jump_back(wp);
} else if (data->jumptype == WINDOW_COPY_JUMPBACK) { } else if (data->jumptype == WINDOW_COPY_JUMPBACK) {
for ( ; np != 0; np--) for (; np != 0; np--)
window_copy_cursor_jump(wp); window_copy_cursor_jump(wp);
} }
break; break;
@ -464,7 +464,6 @@ window_copy_key(struct window_pane *wp, struct client *c, int key)
*data->inputstr = '\0'; *data->inputstr = '\0';
window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1); window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1);
return; /* skip numprefix reset */ return; /* skip numprefix reset */
return; /* skip numprefix reset */
case MODEKEYCOPY_SEARCHUP: case MODEKEYCOPY_SEARCHUP:
data->inputtype = WINDOW_COPY_SEARCHUP; data->inputtype = WINDOW_COPY_SEARCHUP;
data->inputprompt = "Search Up"; data->inputprompt = "Search Up";