circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-13 23:58:51 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 807:

Browse Source 
Style tweaks.
This commit is contained in:
Tiago Cunha 2010-12-25 23:43:53 +00:00
parent a373235106
commit 3585feca54
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
input.c
View File

@ -1,4 +1,4 @@
/* $Id: input.c,v 1.110 2010-12-06 22:52:21 nicm Exp $ */ /* $Id: input.c,v 1.111 2010-12-25 23:43:53 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -720,11 +720,11 @@ input_parse(struct window_pane *wp)
* Execute the handler, if any. Don't switch state if it * Execute the handler, if any. Don't switch state if it
* returns non-zero. * returns non-zero.
*/ */
if (itr->handler && itr->handler(ictx) != 0) if (itr->handler != NULL && itr->handler(ictx) != 0)
continue; continue;
/* And switch state, if necessary. */ /* And switch state, if necessary. */
if (itr->state) { if (itr->state != NULL) {
if (ictx->state->exit != NULL) if (ictx->state->exit != NULL)
ictx->state->exit(ictx); ictx->state->exit(ictx);
ictx->state = itr->state; ictx->state = itr->state;
@ -924,9 +924,9 @@ input_c0_dispatch(struct input_ctx *ictx)
int int
input_esc_dispatch(struct input_ctx *ictx) input_esc_dispatch(struct input_ctx *ictx)
{ {
struct screen_write_ctx *sctx = &ictx->ctx; struct screen_write_ctx *sctx = &ictx->ctx;
struct screen *s = sctx->s; struct screen *s = sctx->s;
struct input_table_entry *entry; struct input_table_entry *entry;
if (ictx->flags & INPUT_DISCARD) if (ictx->flags & INPUT_DISCARD)
return (0); return (0);