committed, thanks

On Sat, Jul 31, 2010 at 11:37:19PM -0400, Ben Boeckel wrote:
> Hi,
> 
> Attached are two patches to fix the usage information for the join-pane
> and paste-buffer usage strings. There's also a patch to remove a
> trailing space in the CHANGES file if it's important.
> 
> --Ben

> Index: cmd-join-pane.c
> ===================================================================
> RCS file: /cvsroot/tmux/tmux/cmd-join-pane.c,v
> retrieving revision 1.4
> diff -U5 -r1.4 cmd-join-pane.c
> --- cmd-join-pane.c   9 Apr 2010 07:09:37 -0000       1.4
> +++ cmd-join-pane.c   1 Aug 2010 03:06:44 -0000
> @@ -42,11 +42,11 @@
>       int      size;
>  };
>  
>  const struct cmd_entry cmd_join_pane_entry = {
>       "join-pane", "joinp",
> -     "[-dhv] [-p percentage|-l size] [-s src-pane] [-t dst-pane] [command]",
> +     "[-dhv] [-p percentage|-l size] [-s src-pane] [-t dst-pane]",
>       0, "",
>       cmd_join_pane_init,
>       cmd_join_pane_parse,
>       cmd_join_pane_exec,
>       cmd_join_pane_free,

> Index: CHANGES
> ===================================================================
> RCS file: /cvsroot/tmux/tmux/CHANGES,v
> retrieving revision 1.303
> diff -U5 -r1.303 CHANGES
> --- CHANGES   18 Jul 2010 13:40:59 -0000      1.303
> +++ CHANGES   1 Aug 2010 03:30:11 -0000
> @@ -10,11 +10,11 @@
>    windows up if necessary.
>  * Merge more mode into copy mode.
>  * Run job commands explicitly in the global environment (which can be 
> modified
>    with setenv -g), rather than with the environment tmux started with.
>  * Use the machine's hostname as the default title, instead of an empty 
> string.
> -* Prevent double free if the window option remain-on-exit is set. 
> +* Prevent double free if the window option remain-on-exit is set.
>  * Key string conversions rewritten.
>  * Mark zombie windows as dead in the choose-window list.
>  * Tiled layout added.
>  * Signal handling reworked.
>  * Reset SIGCHLD after fork to fix problems with some shells.

> Index: cmd-paste-buffer.c
> ===================================================================
> RCS file: /cvsroot/tmux/tmux/cmd-paste-buffer.c,v
> retrieving revision 1.28
> diff -U5 -r1.28 cmd-paste-buffer.c
> --- cmd-paste-buffer.c        6 Jun 2010 00:03:02 -0000       1.28
> +++ cmd-paste-buffer.c        1 Aug 2010 03:30:29 -0000
> @@ -43,11 +43,11 @@
>  void cmd_paste_buffer_free(struct cmd *);
>  size_t       cmd_paste_buffer_print(struct cmd *, char *, size_t);
>  
>  const struct cmd_entry cmd_paste_buffer_entry = {
>       "paste-buffer", "pasteb",
> -     "[-dr] [-s separator] [-b buffer-index] [-t target-window]",
> +     "[-dr] [-s separator] [-b buffer-index] [-t target-pane]",
>       0, "",
>       cmd_paste_buffer_init,
>       cmd_paste_buffer_parse,
>       cmd_paste_buffer_exec,
>       cmd_paste_buffer_free,




> ------------------------------------------------------------------------------
> The Palm PDK Hot Apps Program offers developers who use the
> Plug-In Development Kit to bring their C/C++ apps to Palm for a share
> of $1 Million in cash or HP Products. Visit us here for more details:
> http://p.sf.net/sfu/dev2dev-palm

> _______________________________________________
> tmux-users mailing list
> tmux-users@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/tmux-users


------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users

Reply via email to