Thomas Adam
486421ceff
Merge branch 'obsd-master'
2015-08-28 16:01:09 +01:00
nicm
b0940bdf54
Check changed flag after restarting timer.
2015-08-28 13:26:41 +00:00
nicm
f957db81d9
Remove unused prototypes.
2015-08-28 13:21:25 +00:00
nicm
ed2a486f46
Don't leak name when freeing session, from Kuang-che Wu.
2015-08-28 13:16:03 +00:00
nicm
f6a0f8730e
Per-session timers for locking, and remove the global one-second timer.
2015-08-28 13:12:20 +00:00
Thomas Adam
84eabb2658
Merge branch 'obsd-master'
2015-08-28 14:01:11 +01:00
nicm
57cc4d45d5
Make session_update_activity more useful and use it in more places.
2015-08-28 13:01:03 +00:00
nicm
675def0396
Remove the lock-server option which is a bit redundant, it isn't that
...
different without it.
2015-08-28 12:31:55 +00:00
nicm
6419f66523
Give clock mode its own timer.
2015-08-28 12:25:42 +00:00
nicm
75d10058a4
Run status update on a per-client timer at status-interval.
2015-08-28 12:16:28 +00:00
nicm
18d4802a7b
Log time with message.
2015-08-28 12:15:54 +00:00
nicm
b6618b631b
Move format job cleanup onto its own timer.
2015-08-28 11:38:27 +00:00
Thomas Adam
31c027a37a
Merge branch 'obsd-master'
2015-08-28 12:01:07 +01:00
nicm
ee9f708500
Allow environment variables in #{}.
2015-08-28 10:06:52 +00:00
Thomas Adam
031d7ce840
Merge branch 'obsd-master'
2015-08-28 10:01:08 +01:00
nicm
25faca41eb
Error messages should not have a trailing period.
2015-08-28 07:55:43 +00:00
nicm
fc58e44f89
Only do the automatic-rename dance if the pane has changed (seen output,
...
or new active pane).
2015-08-28 07:49:24 +00:00
Thomas Adam
ce20572ace
Merge branch 'obsd-master'
2015-08-25 18:01:07 +01:00
nicm
2ffbd5b5f0
When searching for tabs, start from screen width, fixes out-of-bounds
...
read found by Kuang-che Wu.
2015-08-25 15:00:05 +00:00
Thomas Adam
429f86397b
Merge branch 'obsd-master'
2015-08-25 02:01:16 +01:00
nicm
3219e0314e
In grid_duplicate_lines, if the line is empty (cellsize == 0) then clear
...
the destination celldata pointer rather than leaving a stale copy of the
source pointer (which may later be freed). Fixes a crash found by
Kuang-che Wu.
2015-08-24 22:49:13 +00:00
Thomas Adam
65b45c9c32
Merge branch 'obsd-master'
2015-08-16 12:01:06 +01:00
nicm
58b659a26e
Come out of copy mode when history is cleared.
2015-08-16 08:57:34 +00:00
Nicholas Marriott
f5357ed940
Handle \ at EOL from Daniel Hahler.
2015-08-15 09:53:19 +01:00
Thomas Adam
778612d152
Merge branch 'obsd-master'
2015-08-13 18:01:07 +01:00
nicm
46aa92420a
right-up should be right-of, also rename the values too.
2015-08-13 15:02:23 +00:00
Thomas Adam
6447404cc2
Merge branch 'obsd-master'
2015-08-12 12:01:09 +01:00
nicm
13b7fd82c1
Rename left/right/up/down relative to active pane to add -of suffix
...
(left-of/right-of/etc) to remove conflict with left/right meaning
leftmost or rightmost pane. From Ben Boeckel.
2015-08-12 08:55:20 +00:00
Nicholas Marriott
3c9b8a28c6
Merge branch 'master' of github.com:tmux/tmux
2015-08-07 15:08:26 +01:00
Nicholas Marriott
736d8350e9
+history-file, from Ben Boeckel.
2015-08-07 15:06:17 +01:00
Thomas Adam
73b4d098ce
Merge branch 'obsd-master'
2015-07-29 14:01:09 +01:00
nicm
5ec3621101
status_out and associated data structures are no longer used.
2015-07-29 11:56:02 +00:00
Thomas Adam
a568aaa0c0
Merge branch 'obsd-master'
2015-07-28 18:01:08 +01:00
nicm
b254115acd
Tidy up the way terminals are described and move some structs out of tmux.h.
2015-07-28 15:18:10 +00:00
Thomas Adam
ff18787b2c
Merge branch 'obsd-master'
2015-07-27 10:01:08 +01:00
nicm
d33adc4fd0
Make -q suppress ambiguous option warnings too, from Cam Hutchison.
2015-07-27 08:45:45 +00:00
Nicholas Marriott
e4cdc9fa0b
Merge branch 'master' of github.com:tmux/tmux
2015-07-24 09:10:21 +01:00
Nicholas Marriott
669059aa19
Fix a warning, from Kosta Zertsekel.
2015-07-24 09:06:15 +01:00
Thomas Adam
18a64ad52d
Merge branch 'obsd-master'
2015-07-20 18:01:10 +01:00
nicm
92af3766ec
Add an option (history-file) for a file to save/restore command prompt
...
history, from Olof-Joachim Frahm.
2015-07-20 15:50:04 +00:00
Thomas Adam
dedd9edf7f
Merge branch 'obsd-master'
2015-07-20 12:01:07 +01:00
nicm
d4ce210713
Correct the tsl/fsl sequence to ]0 not ]2 (from Marcel Korpel). While
...
here, Xr xterm and remove some advice about elinks that is better
elsewhere.
2015-07-20 10:34:11 +00:00
Nicholas Marriott
e6facdcb0c
Merge branch 'master' of github.com:tmux/tmux
2015-07-19 08:10:07 +01:00
Nicholas Marriott
96dcbe217b
Update tmux.vim from Ben Boeckel.
2015-07-19 08:07:55 +01:00
Thomas Adam
e45f42db29
Merge branch 'obsd-master'
2015-07-17 16:01:07 +01:00
nicm
bad8d0fd20
Do not call window_unzoom from window_destroy because it will try to add
...
a notification which will get confused because the reference count is
already zero and end up back in window_destroy and a double
free. Instead, just destroy the layouts directly. Noticed by Thomas
Adam.
2015-07-17 13:09:07 +00:00
Thomas Adam
b886393042
Merge branch 'obsd-master'
2015-07-17 10:01:09 +01:00
nicm
3192178f15
Initialize client fd to -1 as well, from Bobby Powers.
2015-07-17 06:53:47 +00:00
Nicholas Marriott
8c96e2a6d9
Implement osdep_get_name and osdep_get_cwd for AIX, from J Raynor.
2015-07-15 08:46:35 +01:00
Nicholas Marriott
5ffb869e1a
Merge branch 'master' of github.com:tmux/tmux
2015-07-14 08:15:05 +01:00
