circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,503 Commits
1 Branch
35 Tags
65 MiB
Commit Graph

5503 Commits (7fe8edc3962d5c30bf87677ecb2cf8633404f63c)

Author SHA1 Message Date
Thomas Adam 4681415a15 Merge branch 'master' of github.com:tmux/tmux 2015-10-25 09:33:11 +00:00
Nicholas Marriott 7930cb54c0 ifdef __OpenBSD__ around pledge(). 2015-10-25 09:31:46 +00:00
Thomas Adam 91f53d590b __OpenBSD__ around pledge() 2015-10-25 09:31:07 +00:00
Thomas Adam 3e0d31c4e9 Merge branch 'obsd-master' 2015-10-25 09:22:20 +00:00
Thomas Adam 4acc8d0ff5 Merge branch 'obsd-master' 
Conflicts:
	cmd-find.c
 2015-10-25 09:21:37 +00:00
nicm 3faa51a0ca Pass output from jobs through format_expand() so they are expanded again 
(this was the previous behaviour).
 2015-10-25 08:59:26 +00:00
deraadt 3034a71488 Let's see if anyone screams about not being able to specify $TMPDIR 
for their tmux sockets.

(Over the years, I have seen $TMPDIR set up worse than /tmp many times,
and don't know how this practice infected other parts of the system.
Nothing uses tmpdir(3), nor a huge-temporary-file program like sort.)
ok nicm
 2015-10-25 07:48:16 +00:00
nicm 2e2b8a95bd Pasting mouse escape sequences is unlikely, so skip them when working 
out whether the user is pasting.
 2015-10-23 23:46:36 +00:00
nicm 26a55ddcf9 Remove some unnecessary checks before free(). 2015-10-23 16:30:15 +00:00
nicm 1a4ddfa8a7 If $TMUX is set, and we are unsure about the session, use it. 2015-10-23 16:29:07 +00:00
nicm 5383b047d1 tmux can call pledge() in main with large set and then reduce it 
slightly in the server to "stdio rpath wpath cpath fattr unix recvfd
proc exec tty ps".
 2015-10-23 16:07:29 +00:00
nicm 14da999408 Format for scroll position, from Jorge Morante. 2015-10-23 16:02:21 +00:00
nicm 63a3fd3c0f Use tty_term_flag not _has for XT, and make -2 force direct use of 
256-colour escape sequences (so setaf/setab can be bypassed if needed).
 2015-10-23 15:52:54 +00:00
Thomas Adam 8c39813665 Merge branch 'obsd-master' 2015-10-22 14:01:12 +01:00
nicm 3ebcf25149 If the pane is still on all_window_panes but not actually connected to 
window or session (which can happen if it is killed during a command
sequence and something else has a reference), fall back to the best
effort. Fixes "tmux killw\; detach" for Rudis Muiznieks.
 2015-10-22 11:23:00 +00:00
nicm a05c27a7e1 Unzoom before -LRUD, reported by Andy Weidenbaum. 2015-10-22 11:19:31 +00:00
Thomas Adam 6bc3902f5d Merge branch 'obsd-master' 2015-10-22 12:01:09 +01:00
nicm c2c2d44c72 Log identify messages. 2015-10-22 11:00:51 +00:00
nicm 515dfea4b7 This should not be changed. 2015-10-22 10:48:30 +00:00
nicm 31fd071faa Rename shutdown to exit. 2015-10-22 10:46:24 +00:00
Thomas Adam 0bfa615997 Merge branch 'obsd-master' 2015-10-21 16:01:08 +01:00
nicm 60ca29df64 client_key_table was missing. 2015-10-21 13:14:36 +00:00
Thomas Adam 35f582583a Merge branch 'obsd-master' 2015-10-21 14:01:09 +01:00
nicm ddbc4a0f6c By popular demand add a default binding for mouse wheel up to scroll 
into history (if the mouse is, on of course).
 2015-10-21 11:13:47 +00:00
Thomas Adam 1f4a5b5dfe Merge branch 'obsd-master' 2015-10-21 00:01:19 +01:00
nicm 076034345a Use client pointer not file descriptor in logging. 2015-10-20 21:12:08 +00:00
Thomas Adam af2d48f4d2 Merge branch 'obsd-master' 2015-10-20 16:01:11 +01:00
nicm 8c8cddbe02 The table could change when retrying so don't save it at start of 
server_client_handle_key.
 2015-10-20 14:19:27 +00:00
Thomas Adam bbdc08780c Merge branch 'obsd-master' 2015-10-18 22:01:08 +01:00
nicm 174a2ad731 Pass current directory as a string rather than a file descriptor because 
pledge doesn't let us pass directory file descriptors.
 2015-10-18 20:42:42 +00:00
Thomas Adam 7c78b2b756 Start working on tmux 2.2 2015-10-18 18:19:08 +01:00
Thomas Adam 310f0a960c Update for 2.1 release. 2015-10-18 18:10:43 +01:00
Nicholas Marriott 6c3ade76df __OpenBSD__ around pledge(). 2015-10-17 20:16:12 +01:00
Thomas Adam 487285b325 Merge branch 'obsd-master' 2015-10-17 20:01:08 +01:00
nicm 9c601ebde8 Add pledge "stdio unix sendfd proc exec tty" to tmux client process, 
"sendfd" is dropped after first message from the server.
 2015-10-17 18:30:43 +00:00
Nicholas Marriott 0273d809d0 Merge branch 'master' of github.com:tmux/tmux 2015-10-17 18:48:45 +01:00
Nicholas Marriott e0527d7731 time.h is not needed now tzset() is not in log.c. 2015-10-17 18:48:22 +01:00
Thomas Adam a204595e4c Merge branch 'obsd-master' 2015-10-16 10:01:09 +01:00
nicm cf89abb013 Don't free after calling paste_set but do after evbuffer_add, from Theo 
Buehler.
 2015-10-16 07:43:29 +00:00
Nicholas Marriott c06c14fb29 Some header fixes. 2015-10-15 21:42:17 +01:00
Nicholas Marriott 716550021e Merge branch 'master' of github.com:tmux/tmux 2015-10-15 09:25:21 +01:00
Nicholas Marriott f199fb6a2b Fix available_fds when there is no AF_INET, reported by Mathieu Arnold. 2015-10-15 09:24:25 +01:00
Thomas Adam f69e09a67e Merge branch 'obsd-master' 2015-10-11 02:01:14 +01:00
guenther 241fd72f75 Userspace doesn't need to use SUN_LEN(): connect() and bind() must accept 
sizeof(struct sockaddr_un), so do the simple, portable thing

ok beck@ deraadt@
 2015-10-11 00:26:23 +00:00
Thomas Adam 5b13dafbab Merge branch 'obsd-master' 2015-10-07 12:01:21 +01:00
nicm 7340d5adfd Couple of memory leaks in error paths, from Frederik Vanderstraeten. 2015-10-07 09:52:58 +00:00
Thomas Adam 7120ab2f16 Merge branch 'obsd-master' 2015-09-26 02:01:16 +01:00
nicm 695a591f8e Adding colors=256 to *256color* was always pretty stupid and now it 
won't work (without adding setaf@:setab@ too).
 2015-09-25 23:30:24 +00:00
nicm 03d7dba5d8 If the terminal has colors=256, only try to use setaf/setab if they 
exist, reported by Filipe Brandenburger.
 2015-09-25 23:30:12 +00:00
Thomas Adam 20c3adca41 Merge branch 'obsd-master' 2015-09-25 18:01:09 +01:00