Index: arguments.c --- arguments.c.orig 2017-08-24 08:52:01.000000000 +0200 +++ arguments.c 2017-10-24 20:49:11.767579000 +0200 @@ -65,7 +65,9 @@ args = xcalloc(1, sizeof *args); +#ifdef __Linux__ optreset = 1; +#endif optind = 1; while ((opt = getopt(argc, argv, template)) != -1) { Index: compat.h --- compat.h.orig 2017-09-10 10:03:16.000000000 +0200 +++ compat.h 2017-10-24 20:49:11.767754000 +0200 @@ -221,6 +221,22 @@ int getdtablecount(void); #endif +#ifndef MAXPATHLEN +#define MAXPATHLEN 4096 +#endif + +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN 64 +#endif + +#ifndef IOV_MAX +#define IOV_MAX 1024 +#endif + #ifndef HAVE_CLOSEFROM /* closefrom.c */ void closefrom(int); Index: osdep-freebsd.c --- osdep-freebsd.c.orig 2017-06-02 21:29:34.000000000 +0200 +++ osdep-freebsd.c 2017-10-24 20:49:11.767887000 +0200 @@ -29,7 +29,9 @@ #include #include #include +#if 0 #include +#endif struct kinfo_proc *cmp_procs(struct kinfo_proc *, struct kinfo_proc *); char *osdep_get_name(int, char *); @@ -135,6 +137,7 @@ static char * osdep_get_cwd_fallback(int fd) { +#if 0 static char wd[PATH_MAX]; struct kinfo_file *info = NULL; pid_t pgrp; @@ -155,6 +158,7 @@ } free(info); +#endif return (NULL); } Index: tmux.1 --- tmux.1.orig 2017-09-11 11:08:16.000000000 +0200 +++ tmux.1 2017-10-24 20:50:51.252537000 +0200 @@ -534,7 +534,7 @@ .Ql - may be followed by an offset, for example: .Bd -literal -offset indent -select-window -t:+2 +select-window \-t:+2 .Ed .Pp In addition, @@ -651,13 +651,13 @@ .Nm commands include: .Bd -literal -offset indent -refresh-client -t/dev/ttyp2 +refresh-client \-t/dev/ttyp2 -rename-session -tfirst newname +rename-session \-tfirst newname -set-window-option -t:0 monitor-activity on +set-window-option \-t:0 monitor-activity on -new-window ; split-window -d +new-window ; split-window \-d bind-key R source-file ~/.tmux.conf \e; \e display-message "source-file done" @@ -666,11 +666,11 @@ Or from .Xr sh 1 : .Bd -literal -offset indent -$ tmux kill-window -t :1 +$ tmux kill-window \-t :1 -$ tmux new-window \e; split-window -d +$ tmux new-window \e; split-window \-d -$ tmux new-session -d 'vi /etc/passwd' \e; split-window -d \e; attach +$ tmux new-session \-d 'vi /etc/passwd' \e; split-window \-d \e; attach .Ed .Sh CLIENTS AND SESSIONS The @@ -1397,7 +1397,7 @@ and the result executed as a command. If .Ar template -is not given, "detach-client -t '%%'" is used. +is not given, "detach-client \-t '%%'" is used. .Pp .Fl O specifies the initial sort order: one of @@ -1457,7 +1457,7 @@ and the result executed as a command. If .Ar template -is not given, "switch-client -t '%%'" is used. +is not given, "switch-client \-t '%%'" is used. .Pp .Fl O specifies the initial sort order: one of @@ -1508,7 +1508,7 @@ substituted by the pane ID. The default .Ar template -is "select-pane -t '%%'". +is "select-pane \-t '%%'". .It Xo Ic find-window .Op Fl CNT .Op Fl t Ar target-pane @@ -1804,7 +1804,7 @@ option only opens a new pipe if no previous pipe exists, allowing a pipe to be toggled with a single key, for example: .Bd -literal -offset indent -bind-key C-p pipe-pane -o 'cat >>~/output.#I-#P' +bind-key C-p pipe-pane \-o 'cat >>~/output.#I-#P' .Ed .It Xo Ic previous-layout .Op Fl t Ar target-window @@ -1982,7 +1982,7 @@ sets the style for a single pane. For example, to set the pane 1 background to red: .Bd -literal -offset indent -select-pane -t:.1 -P 'bg=red' +select-pane \-t:.1 -P 'bg=red' .Ed .Pp .Fl g @@ -2339,8 +2339,8 @@ and be set to any string. For example: .Bd -literal -offset indent -$ tmux setw -q @foo "abc123" -$ tmux showw -v @foo +$ tmux setw \-q @foo "abc123" +$ tmux showw \-v @foo abc123 .Ed .Pp @@ -2861,7 +2861,7 @@ Examples are: .Bd -literal -offset indent #(sysctl vm.loadavg) -#[fg=yellow,bold]#(apm -l)%%#[default] [#S] +#[fg=yellow,bold]#(apm \-l)%%#[default] [#S] .Ed .Pp The default is @@ -3044,7 +3044,7 @@ or with a terminal escape sequence. It may be switched off globally with: .Bd -literal -offset indent -set-window-option -g automatic-rename off +set-window-option \-g automatic-rename off .Ed .Pp .It Ic automatic-rename-format Ar format @@ -4112,7 +4112,7 @@ and the result executed as a command. If .Ar template -is not given, "paste-buffer -b '%%'" is used. +is not given, "paste-buffer \-b '%%'" is used. .Pp .Fl O specifies the initial sort order: one of @@ -4526,22 +4526,22 @@ .Pp Changing the default prefix key: .Bd -literal -offset indent -set-option -g prefix C-a +set-option \-g prefix C-a unbind-key C-b bind-key C-a send-prefix .Ed .Pp Turning the status line off, or changing its colour: .Bd -literal -offset indent -set-option -g status off -set-option -g status-style bg=blue +set-option \-g status off +set-option \-g status-style bg=blue .Ed .Pp Setting other options, such as the default command, or locking after 30 minutes of inactivity: .Bd -literal -offset indent -set-option -g default-command "exec /bin/ksh" -set-option -g lock-after-time 1800 +set-option \-g default-command "exec /bin/ksh" +set-option \-g lock-after-time 1800 .Ed .Pp Creating new key bindings: