===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-keys.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/tmux/cmd-list-keys.c	2012/01/21 11:12:13	1.17
--- src/usr.bin/tmux/cmd-list-keys.c	2012/07/11 07:10:15	1.18
***************
*** 1,4 ****
! /* $OpenBSD: cmd-list-keys.c,v 1.17 2012/01/21 11:12:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-list-keys.c,v 1.18 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 26,35 ****
   * List key bindings.
   */
  
! int	cmd_list_keys_exec(struct cmd *, struct cmd_ctx *);
  
- int	cmd_list_keys_table(struct cmd *, struct cmd_ctx *);
- 
  const struct cmd_entry cmd_list_keys_entry = {
  	"list-keys", "lsk",
  	"t:", 0, 0,
--- 26,34 ----
   * List key bindings.
   */
  
! enum cmd_retval	 cmd_list_keys_exec(struct cmd *, struct cmd_ctx *);
! enum cmd_retval	 cmd_list_keys_table(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_list_keys_entry = {
  	"list-keys", "lsk",
  	"t:", 0, 0,
***************
*** 40,46 ****
  	cmd_list_keys_exec
  };
  
! int
  cmd_list_keys_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
--- 39,45 ----
  	cmd_list_keys_exec
  };
  
! enum cmd_retval
  cmd_list_keys_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
***************
*** 95,101 ****
  		ctx->print(ctx, "bind-key %s", tmp);
  	}
  
! 	return (0);
  }
  
  int
--- 94,100 ----
  		ctx->print(ctx, "bind-key %s", tmp);
  	}
  
! 	return (CMD_RETURN_NORMAL);
  }
  
  int
***************
*** 111,117 ****
  	tablename = args_get(args, 't');
  	if ((mtab = mode_key_findtable(tablename)) == NULL) {
  		ctx->error(ctx, "unknown key table: %s", tablename);
! 		return (-1);
  	}
  
  	width = 0;
--- 110,116 ----
  	tablename = args_get(args, 't');
  	if ((mtab = mode_key_findtable(tablename)) == NULL) {
  		ctx->error(ctx, "unknown key table: %s", tablename);
! 		return (CMD_RETURN_ERROR);
  	}
  
  	width = 0;
***************
*** 145,149 ****
  		}
  	}
  
! 	return (0);
  }
--- 144,148 ----
  		}
  	}
  
! 	return (CMD_RETURN_NORMAL);
  }