Update of /cvsroot/tmux/tmux
In directory vz-cvs-2.sog:/tmp/cvs-serv18412
Modified Files:
paste.c tmux.h window-copy.c
Log Message:
|PatchSet 873
|Date: 2011/03/28 20:44:31
|Author: nicm
|Branch: HEAD
|Tag: (none)
|Log:
|Style: uint -> u_int and a missing else.
Index: window-copy.c
===================================================================
RCS file: /cvsroot/tmux/tmux/window-copy.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- window-copy.c 30 Dec 2010 22:39:49 -0000 1.127
+++ window-copy.c 6 Apr 2011 22:18:56 -0000 1.128
@@ -368,8 +368,8 @@
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 @@
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 @@
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 @@
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;
Index: paste.c
===================================================================
RCS file: /cvsroot/tmux/tmux/paste.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- paste.c 30 Dec 2010 22:39:49 -0000 1.16
+++ paste.c 6 Apr 2011 22:18:56 -0000 1.17
@@ -30,7 +30,7 @@
/* Return each item of the stack in turn. */
struct paste_buffer *
-paste_walk_stack(struct paste_stack *ps, uint *idx)
+paste_walk_stack(struct paste_stack *ps, u_int *idx)
{
struct paste_buffer *pb;
Index: tmux.h
===================================================================
RCS file: /cvsroot/tmux/tmux/tmux.h,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -d -r1.614 -r1.615
--- tmux.h 6 Apr 2011 22:17:33 -0000 1.614
+++ tmux.h 6 Apr 2011 22:18:56 -0000 1.615
@@ -1450,7 +1450,7 @@
int tty_keys_next(struct tty *);
/* paste.c */
-struct paste_buffer *paste_walk_stack(struct paste_stack *, uint *);
+struct paste_buffer *paste_walk_stack(struct paste_stack *, u_int *);
struct paste_buffer *paste_get_top(struct paste_stack *);
struct paste_buffer *paste_get_index(struct paste_stack *, u_int);
int paste_free_top(struct paste_stack *);
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
