diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2010-03-16 17:51:32 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2010-03-16 17:51:32 +0000 |
| commit | 33a90efc936a345c130bc2823c616ab1680385aa (patch) | |
| tree | c131921a8ba2d3f032b30ea898372be446df09c3 | |
| parent | 009d8d2ea7aecd47207658bd08a9959919bd4fdc (diff) | |
| download | rtmux-33a90efc936a345c130bc2823c616ab1680385aa.tar.gz rtmux-33a90efc936a345c130bc2823c616ab1680385aa.tar.bz2 rtmux-33a90efc936a345c130bc2823c616ab1680385aa.zip | |
Minor Nazi style tweaks to previous, and man page rephrasery.
| -rw-r--r-- | tmux.1 | 18 | ||||
| -rw-r--r-- | window-copy.c | 15 |
2 files changed, 17 insertions, 16 deletions
@@ -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> .\" @@ -671,14 +671,16 @@ The three next and previous space keys work similarly but use a space alone as the word separator. .Pp The jump commands enable quick movement within a line. -For instance, with the default bindings (in either vi or emacs mode), -you can type -.Ql f/ , -and the cursor will jump to the next slash character on the current line. -You can then type +For instance, typing +.Ql f +followed by +.Ql / +will move the cursor to the next +.Ql / +character on the current line. +A .Ql \&; -to cause the cursor to jump to the next occurrence of a slash. -(These are based on vi editor commands.) +will then jump to the next occurrence. .Pp 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 diff --git a/window-copy.c b/window-copy.c index 97803675..8bbb798f 100644 --- a/window-copy.c +++ b/window-copy.c @@ -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> @@ -258,10 +258,10 @@ window_copy_key(struct window_pane *wp, struct client *c, int key) if ((key & 0xff00) == 0) { data->jumpchar = key; if (data->inputtype == WINDOW_COPY_JUMPFORWARD) { - for ( ; np != 0; np--) + for (; np != 0; np--) window_copy_cursor_jump(wp); } else { - for ( ; np != 0; np--) + for (; np != 0; np--) 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 */ case MODEKEYCOPY_JUMPAGAIN: if (data->jumptype == WINDOW_COPY_JUMPFORWARD) { - for ( ; np != 0; np--) + for (; np != 0; np--) window_copy_cursor_jump(wp); } else if (data->jumptype == WINDOW_COPY_JUMPBACK) { - for ( ; np != 0; np--) + for (; np != 0; np--) window_copy_cursor_jump_back(wp); } break; case MODEKEYCOPY_JUMPREVERSE: if (data->jumptype == WINDOW_COPY_JUMPFORWARD) { - for ( ; np != 0; np--) + for (; np != 0; np--) window_copy_cursor_jump_back(wp); } else if (data->jumptype == WINDOW_COPY_JUMPBACK) { - for ( ; np != 0; np--) + for (; np != 0; np--) window_copy_cursor_jump(wp); } break; @@ -464,7 +464,6 @@ window_copy_key(struct window_pane *wp, struct client *c, int key) *data->inputstr = '\0'; window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1); return; /* skip numprefix reset */ - return; /* skip numprefix reset */ case MODEKEYCOPY_SEARCHUP: data->inputtype = WINDOW_COPY_SEARCHUP; data->inputprompt = "Search Up"; |