Applied this one to OpenBSD now, will be in SF after the next
sync. Thanks
On Tue, May 13, 2014 at 04:25:41PM -0700, Keith Amling wrote:
> Keith
>
> ---
> key-bindings.c | 17 ++---------------
> server.c | 1 -
> tmux.h | 1 -
> 3 files changed, 2 insertions(+), 17 deletions(-)
>
> diff --git a/key-bindings.c b/key-bindings.c
> index f725508bce62..58be0c6fe896 100644
> --- a/key-bindings.c
> +++ b/key-bindings.c
> @@ -27,7 +27,6 @@
> RB_GENERATE(key_bindings, key_binding, entry, key_bindings_cmp);
>
> struct key_bindings key_bindings;
> -struct key_bindings dead_key_bindings;
>
> int
> key_bindings_cmp(struct key_binding *bd1, struct key_binding *bd2)
> @@ -78,20 +77,8 @@ key_bindings_remove(int key)
> if ((bd = key_bindings_lookup(key)) == NULL)
> return;
> RB_REMOVE(key_bindings, &key_bindings, bd);
> - RB_INSERT(key_bindings, &dead_key_bindings, bd);
> -}
> -
> -void
> -key_bindings_clean(void)
> -{
> - struct key_binding *bd;
> -
> - while (!RB_EMPTY(&dead_key_bindings)) {
> - bd = RB_ROOT(&dead_key_bindings);
> - RB_REMOVE(key_bindings, &dead_key_bindings, bd);
> - cmd_list_free(bd->cmdlist);
> - free(bd);
> - }
> + cmd_list_free(bd->cmdlist);
> + free(bd);
> }
>
> void
> diff --git a/server.c b/server.c
> index d3ac0f8b0cdd..5ae44df23eff 100644
> --- a/server.c
> +++ b/server.c
> @@ -209,7 +209,6 @@ server_loop(void)
> server_window_loop();
> server_client_loop();
>
> - key_bindings_clean();
> server_clean_dead();
> }
> }
> diff --git a/tmux.h b/tmux.h
> index fde94afc47b3..f9d6087ab714 100644
> --- a/tmux.h
> +++ b/tmux.h
> @@ -1871,7 +1871,6 @@ RB_PROTOTYPE(key_bindings, key_binding, entry,
> key_bindings_cmp);
> struct key_binding *key_bindings_lookup(int);
> void key_bindings_add(int, int, struct cmd_list *);
> void key_bindings_remove(int);
> -void key_bindings_clean(void);
> void key_bindings_init(void);
> void key_bindings_dispatch(struct key_binding *, struct client *);
>
> --
> 1.9.1
>
>
> ------------------------------------------------------------------------------
> "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
> Instantly run your Selenium tests across 300+ browser/OS combos.
> Get unparalleled scalability from the best Selenium testing platform available
> Simple to use. Nothing to install. Get started now for free."
> http://p.sf.net/sfu/SauceLabs
> _______________________________________________
> tmux-users mailing list
> tmux-users@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/tmux-users
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
