circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2018-10-03 17:02:38 +01:00
parent 5a7cf897f2 f7c85f3ed8
commit c44bb2df17
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tmux.h
View File

@ -945,7 +945,7 @@ RB_HEAD(sessions, session);
/* Mouse wheel states. */
#define MOUSE_WHEEL_UP 0
#define MOUSE_WHEEL_DOWN 64
#define MOUSE_WHEEL_DOWN 1
/* Mouse helpers. */
#define MOUSE_BUTTONS(b) ((b) & MOUSE_MASK_BUTTONS)

2
window-copy.c
View File

@ -529,7 +529,7 @@ window_copy_command(struct window_pane *wp, struct client *c, struct session *s,
return;
command = args->argv[0];
if (m != NULL && m->valid)
if (m != NULL && m->valid && !MOUSE_WHEEL(m->b))
window_copy_move_mouse(m);
if (args->argc == 1) {