From 8ab7fcf7eba8121837a4edf0c214ec0acd31e6bf Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 6 Apr 2011 22:18:56 +0000 Subject: |PatchSet 873 |Date: 2011/03/28 20:44:31 |Author: nicm |Branch: HEAD |Tag: (none) |Log: |Style: uint -> u_int and a missing else. --- window-copy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'window-copy.c') diff --git a/window-copy.c b/window-copy.c index 0e45003f..6d21d5f0 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1,4 +1,4 @@ -/* $Id: window-copy.c,v 1.127 2010-12-30 22:39:49 tcunha Exp $ */ +/* $Id: window-copy.c,v 1.128 2011-04-06 22:18:56 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -368,8 +368,8 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key) if (np == 0) np = 1; - if (data->inputtype == WINDOW_COPY_JUMPFORWARD - || data->inputtype == WINDOW_COPY_JUMPBACK) { + if (data->inputtype == WINDOW_COPY_JUMPFORWARD || + data->inputtype == WINDOW_COPY_JUMPBACK) { /* Ignore keys with modifiers. */ if ((key & KEYC_MASK_MOD) == 0) { data->jumpchar = key; @@ -385,7 +385,7 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key) data->inputtype = WINDOW_COPY_OFF; window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1); return; - } if (data->inputtype == WINDOW_COPY_NUMERICPREFIX) { + } else if (data->inputtype == WINDOW_COPY_NUMERICPREFIX) { if (window_copy_key_numeric_prefix(wp, key) == 0) return; data->inputtype = WINDOW_COPY_OFF; @@ -1617,7 +1617,7 @@ window_copy_cursor_jump(struct window_pane *wp) struct window_copy_mode_data *data = wp->modedata; struct screen *back_s = data->backing; const struct grid_cell *gc; - uint px, py, xx; + u_int px, py, xx; px = data->cx + 1; py = screen_hsize(back_s) + data->cy - data->oy; @@ -1643,7 +1643,7 @@ window_copy_cursor_jump_back(struct window_pane *wp) struct window_copy_mode_data *data = wp->modedata; struct screen *back_s = data->backing; const struct grid_cell *gc; - uint px, py; + u_int px, py; px = data->cx; py = screen_hsize(back_s) + data->cy - data->oy; -- cgit