Skip to content

Commit 2dd7261

Browse files
dylexdylex
committed
Merge tag '1.8' into nox/1.8
Version 1.8 of tmux Conflicts: cmd-set-option.c cmd-show-options.c input-keys.c server-client.c server.c tmux.1 tmux.c tmux.h window-copy.c
2 parents 32f7865 + 1b083aa commit 2dd7261

File tree

132 files changed

+5167
-3680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+5167
-3680
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
*.o
22
*~
3+
*.diff
4+
*.patch
5+
*.core
6+
core
7+
tags
38
.deps/
49
/aclocal.m4
510
/autom4te.cache/

‎.mailmap

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Bob Beck <beck@openbsd.org> beck <beck>
2+
Igor Sobrado <sobrado@openbsd.org> sobrado <sobrado>
3+
Jacek Masiulaniec <jacekm@openbsd.org> jacekm <jacekm>
4+
Jason McIntyre <jmc@openbsd.org> jcm <jcm>
5+
Joel Sing <jsing@openbsd.org> jsing <jsing>
6+
Marc Espie <espie@openbsd.org> espie <espie>
7+
Matthew Dempsky <matthew@openbsd.org> matthew <matthew>
8+
Matthias Kilian <kili@openbsd.org> kili <kili>
9+
Matthieu Herrb <matthieu@openbsd.org> matthieu <matthieu>
10+
Miod Vallat <miod@openbsd.org> miod <miod>
11+
Nicholas Marriott <nicm@openbsd.org> nicm <nicm>
12+
Nicholas Marriott <nicm@openbsd.org> no_author <no_author@example.org>
13+
<nicm@openbsd.org> <nicholas.marriott@gmail.com>
14+
Okan Demirmen <okan@openbsd.org> okan <okan>
15+
Philip Guenther <guenther@openbsd.org> guenther <guenther>
16+
Pierre-Yves Ritschard <pyr@openbsd.org> pyr <pyr>
17+
Ray Lai <ray@openbsd.org> ray <ray>
18+
Ryan McBride <mcbride@openbsd.org> mcbride <mcbride>
19+
Stefan Sperling <stsp@openbsd.org> stsp <stsp>
20+
Stuart Henderson <sthen@openbsd.org> sthen <sthen>
21+
Ted Unangst <tedu@openbsd.org> tedu <tedu>
22+
Theo Deraadt <deraadt@openbsd.org> deraadt <deraadt>
23+
Thomas Adam <thomas@xteddy.org> Thomas <thomas@xteddy.org>
24+
William Yodlowsky <william@openbsd.org> william <william>

‎CHANGES

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,54 @@
1+
CHANGES FROM 1.7 to 1.8, 26 March 2013
2+
3+
Incompatible Changes
4+
====================
5+
6+
* layout redo/undo has been removed.
7+
8+
Normal Changes
9+
==============
10+
11+
* Add halfpage up/down bindings to copy mode.
12+
* Session choosing fixed to work with unattached sessions.
13+
* New window options window-status-last-{attr,bg,fg} to denote the last
14+
window which was active.
15+
* Scrolling in copy-mode now scrolls the region without moving the mouse
16+
cursor.
17+
* run-shell learnt '-t' to specify the pane to use when displaying output.
18+
* Support for middle-click pasting.
19+
* choose-tree learns '-u' to start uncollapsed.
20+
* select-window learnt '-T; to toggle to the last window if it's already
21+
current.
22+
* New session option 'assume-paste-time' for pasting text versus key-binding
23+
actions.
24+
* choose-* commands now work outside of an attached client.
25+
* Aliases are now shown for list-commands command.
26+
* Status learns about formats.
27+
* Free-form options can be set with set-option if prepended with an '@'
28+
sign.
29+
* capture-pane learnt '-p' to send to stdout, and '-e' for capturing escape
30+
sequences, and '-a' to capture the alternate screen, and '-P' to dump
31+
pending output.
32+
* Many new formats added (client_session, client_last_session, etc.)
33+
* Control mode, which is a way for a client to send tmux commands.
34+
Currently more useful to users of iterm2.
35+
* resize-pane learnt '-x' and '-y' for absolute pane sizing.
36+
* Config file loading now reports errors from all files which are loaded via
37+
the 'source-file' command.
38+
* 'copy-pipe' mode command to copy selection and pipe the selection to a
39+
command.
40+
* Changes panes can now emit focus notifications for certain applications
41+
which use those.
42+
* run-shell and if-shell now accept format placeholders.
43+
* resize-pane learnt '-Z' for zooming a pane temporarily.
44+
* new-session learnt '-A' to make it behave like attach-session.
45+
* set-option learnt '-o' to prevent setting an option which is already set.
46+
* capture-pane and show-options learns '-q' to silence errors.
47+
* New command 'wait-for' which blocks a client until woken up again.
48+
* Resizing panes will now reflow the text inside them.
49+
* Lots and lots of bug fixes, fixing memory-leaks, etc.
50+
* Various manpage improvements.
51+
152
CHANGES FROM 1.6 to 1.7, 13 October 2012
253

354
* tmux configuration files now support line-continuation with a "\" at the

‎FAQ

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -326,51 +326,6 @@ lock(1) or vlock(1)) by using the following:
326326

327327
bind x set lock-command '/usr/bin/vlock' \; lock-client \; set lock-command 'tput civis && read -s -n1'
328328

329-
* How can I open a new window in the same directory as the current window?
330-
331-
One option is to just run "TMUX= tmux" in the window. However, this only works if no
332-
command is running, so that you can input the command.
333-
334-
A workaround is to let tmux know about the current path through an environment
335-
variable. To do so, use the following command:
336-
337-
[ -n "$TMUX" ] && tmux setenv TMUXPWD_$(tmux display -p "#I") $PWD
338-
339-
Which sets TMUXPWD_i (where i is the number of the current window) to the path
340-
of the current directory. This command can be added to PS1, for example:
341-
342-
PS1='$([ -n "$TMUX" ] && tmux setenv TMUXPWD_$(tmux display -p "#I") $PWD)\h$ '
343-
344-
When a new window is created, the shell should be asked to change
345-
directory. You can define a new binding (for example, if using GNU bash):
346-
347-
bind-key C-c run-shell 'tmux neww "cd $(tmux display -p "\$TMUXPWD_#I"); exec bash"'
348-
349-
This solution will work even if a command is currently running in the terminal,
350-
but it will not work from a window that has just been swapped with another
351-
because TMUXPWD_i will not be updated after a swap. However, once a new prompt
352-
is displayed, TMUXPWD_i is updated properly.
353-
354-
* tmux doesn't start with "daemon failed"
355-
356-
tmux shows something similar to this when started:
357-
358-
fatal: server_start: daemon failed: No such file or directory
359-
fatal: main_dispatch: imsg_read failed
360-
361-
A possible reason is that /dev/null is not a character device or is otherwise
362-
inaccessible.
363-
364-
Check with:
365-
366-
file /dev/null
367-
ls -l /dev/null
368-
369-
If it is not a character device or has incorrect permissions, it can typically
370-
be recreated with:
371-
372-
cd /dev && rm null && ./MAKEDEV null
373-
374329
* vim displays reverse video instead of italics, while less displays italics
375330
(or just regular text) instead of reverse. What's wrong?
376331

‎Makefile.am

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dist_man1_MANS = tmux.1
66

77
# Distribution tarball options.
88
EXTRA_DIST = \
9-
CHANGES FAQ NOTES TODO examples compat \
9+
CHANGES FAQ README TODO examples compat \
1010
array.h compat.h tmux.h osdep-*.c
1111
dist-hook:
1212
grep "^#found_debug=" configure
@@ -24,14 +24,17 @@ endif
2424
# Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly
2525
# different flags.
2626
if IS_GCC
27-
CFLAGS += -std=c99
27+
CFLAGS += -std=gnu99
2828
if IS_DEBUG
29-
CFLAGS += -g -ggdb -O0
29+
CFLAGS += -O0 -g
3030
CFLAGS += -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
3131
CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
3232
CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
3333
CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align
34+
CFLAGS += -Wdeclaration-after-statement
3435
CPPFLAGS += -DDEBUG
36+
else
37+
CFLAGS += -O2
3538
endif
3639
if IS_GCC4
3740
CPPFLAGS += -iquote. -I/usr/local/include
@@ -101,6 +104,7 @@ dist_tmux_SOURCES = \
101104
cmd-new-window.c \
102105
cmd-paste-buffer.c \
103106
cmd-pipe-pane.c \
107+
cmd-queue.c \
104108
cmd-refresh-client.c \
105109
cmd-rename-session.c \
106110
cmd-rename-window.c \
@@ -114,12 +118,10 @@ dist_tmux_SOURCES = \
114118
cmd-select-pane.c \
115119
cmd-select-window.c \
116120
cmd-send-keys.c \
117-
cmd-send-prefix.c \
118121
cmd-server-info.c \
119122
cmd-set-buffer.c \
120123
cmd-set-environment.c \
121124
cmd-set-option.c \
122-
cmd-show-buffer.c \
123125
cmd-show-environment.c \
124126
cmd-show-messages.c \
125127
cmd-show-options.c \
@@ -133,13 +135,14 @@ dist_tmux_SOURCES = \
133135
cmd-switch-client.c \
134136
cmd-unbind-key.c \
135137
cmd-unlink-window.c \
138+
cmd-wait-for.c \
136139
cmd.c \
137140
colour.c \
138141
control.c \
139142
control-notify.c \
140143
environ.c \
141144
format.c \
142-
grid-utf8.c \
145+
grid-cell.c \
143146
grid-view.c \
144147
grid.c \
145148
input-keys.c \

‎NOTES renamed to ‎README

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ To build tmux from a release tarball, do:
1616
$ ./configure && make
1717
$ sudo make install
1818

19-
To get and build the latest version control checkout:
19+
To get and build the latest from version control:
2020

21-
$ git clone git://tmux.git.sourceforge.net/gitroot/tmux/tmux
21+
$ git clone git://git.code.sf.net/p/tmux/tmux-code tmux
2222
$ cd tmux
2323
$ sh autogen.sh
2424
$ ./configure && make
2525

2626
For more information see https://sourceforge.net/scm/?type=git&group_id=200378
27-
and http://git-scm.com.
27+
and http://git-scm.com. Patches should be sent by email to the mailing list at
28+
tmux-users@lists.sourceforge.net.
2829

2930
For documentation on using tmux, see the tmux.1 manpage. It can be viewed from
3031
the source tree with:
@@ -34,25 +35,13 @@ the source tree with:
3435
Some common questions are answered in the FAQ file and a more extensive (but
3536
slightly out of date) guide is available in the OpenBSD FAQ at
3637
http://www.openbsd.org/faq/faq7.html#tmux. A rough todo list is in the TODO
37-
file.
38-
39-
A Vim syntax file is available in the examples directory. To install it:
40-
41-
- Drop the file in the syntax directory into runtimepath (such as
42-
~/.vim/syntax/tmux.vim).
43-
- Make the filetype recognisable by adding the following to filetype.vim
44-
(~/.vim/filetype.vim):
45-
46-
augroup filetypedetect
47-
au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
48-
augroup END
49-
50-
- Switch on syntax highlighting by adding "syntax enable" to .vimrc.
38+
file and some example configurations and a Vim syntax file are in the examples
39+
directory.
5140

5241
For debugging, running tmux with -v or -vv will generate server and client log
5342
files in the current directory.
5443

55-
tmux mailing lists are available. The visit:
44+
tmux mailing lists are available. Visit:
5645

5746
https://sourceforge.net/mail/?group_id=200378
5847

@@ -64,8 +53,7 @@ welcome. Please send by email to:
6453
This file and the CHANGES, FAQ and TODO files are licensed under the ISC
6554
license. Files under examples/ remain copyright their authors unless otherwise
6655
stated in the file but permission has been received to distribute them with
67-
tmux. All other files have a license and copyright notice at their
68-
start.
56+
tmux. All other files have a license and copyright notice at their start.
6957

7058
-- Nicholas Marriott <nicm@users.sf.net>
7159

0 commit comments

Comments
 (0)