Commit Graph

4788 Commits

Author SHA1 Message Date
Nicholas Marriott
594348440e Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2014-02-26 13:49:41 +00:00
Nicholas Marriott
091cd0109f Add. 2014-02-26 13:48:25 +00:00
Thomas Adam
225164a9d6 Fix xterm-keys.vim syntax
Fix the typo in the xterm-keys.vim file, from Mark Oteiza.
2014-02-25 20:23:08 +00:00
Nicholas Marriott
f3152079e1 I prefer . here not :. 2014-02-24 23:11:25 +00:00
Nicholas Marriott
bf82f15bba Missing period. 2014-02-24 23:09:19 +00:00
Nicholas Marriott
4273c1b80e Use utempter to update utmp if it's around for configure, from madmaverick9 at
roxxmail dot eu.
2014-02-24 23:07:22 +00:00
Nicholas Marriott
488583dc8d Add to TODO. 2014-02-23 10:19:04 +00:00
nicm
f1828921df Change terminal-overrides to a server option (now that we have them), it
doesn't make much sense as a session option.
2014-02-23 00:53:06 +00:00
Thomas Adam
7eed5ad97b Go back to working on 1.10 2014-02-22 21:09:09 +00:00
Thomas Adam
80d9964a30 Update CHANGES and configure.ac for 1.9a release 2014-02-22 20:55:59 +00:00
Thomas Adam
150ef86800 Merge branch 'obsd-master' 2014-02-22 20:48:44 +00:00
nicm
315d45a0eb Fix crash due to uninitialized lastwp member of layout_cell, reported by
Balazs Kezes.
2014-02-22 18:01:10 +00:00
Nicholas Marriott
2a412fad04 Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2014-02-22 17:36:17 +00:00
Nicholas Marriott
fe6f520054 FAQ about xterm-keys in emacs and vim, from Mark Oteiza. 2014-02-22 17:35:41 +00:00
nicm
c7f3599ebc Fix -fg/-bg/-style with 256 colour terminals. 2014-02-22 01:38:47 +00:00
Thomas Adam
b7589750a1 Correct Linux-specific manpage sections
Some of the man page locations on Linux differ to those on *BSD.  Noticed by
Christopher Meng.
2014-02-21 09:27:28 +00:00
Nicholas Marriott
c310212d28 Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2014-02-21 08:03:42 +00:00
Nicholas Marriott
94d99d5462 Put each command on its own line and remove duplicates, from Daniel Hahler. 2014-02-21 08:02:48 +00:00
Thomas Adam
9120df33ef dist: Call clean target before any other action
In case 'make dist' is invoked from a dirty tree which hasn't had its object
files cleaned up, clean out the tree first before tarring up the files for a
release.
2014-02-20 23:20:17 +00:00
Thomas Adam
1ab0745f8e Working on 1.10 2014-02-20 21:44:33 +00:00
Thomas Adam
c5d2de7ec0 Update CHANGES and configure.ac for 1.9 release 2014-02-20 21:32:42 +00:00
Thomas Adam
ca1d78f523 Merge branch 'obsd-master' 2014-02-19 15:05:07 +00:00
nicm
6daf06b1ad Fix memory leaks with paste_replace, based on changes from J Raynor. 2014-02-17 23:07:03 +00:00
nicm
69b7c496ac Be consistent and allow only mouse down and mouse wheel for any pane
with mouse-select-pane rather than just in copy mode, reported by Balazs
Kezes.
2014-02-17 22:42:20 +00:00
nicm
1e981f4c6d Don't crash when given a invalid colour, reported by Felix Rosencrantz,
fix from Thomas Adam.
2014-02-17 18:12:47 +00:00
Nicholas Marriott
d325104d10 Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2014-02-17 18:09:25 +00:00
Thomas Adam
b3de4a3dec Merge branch 'obsd-master'
Conflicts:
	tmux.1
	tmux.c
2014-02-16 23:02:07 +00:00
nicm
81db6bab91 Leftovers from removing 88 colour support, from Theo Buehler. 2014-02-16 12:45:17 +00:00
nicm
f2e54e1e2f If the terminfo entry has colors#256, assume that setaf and setab work
and use them for the 256 colour set. If the terminfo entry doesn't have
colors#256 and the user gives -2 to the client, use a \033[38;5;Xm
sequence as before. Should allow fbterm to work with it's weird setaf
and setab.
2014-02-14 14:37:08 +00:00
nicm
e9d32f901a Make status-interval of zero work as indented. 2014-02-14 14:00:18 +00:00
nicm
f835be4bb2 Style nit - no space between function name and bracket. 2014-02-14 13:59:01 +00:00
Nicholas Marriott
3aadc9d665 Missing *. 2014-02-14 13:56:39 +00:00
nicm
bfb700cf41 Do not need to call winlink_find_by_window, from Filip Moc. 2014-02-14 12:44:45 +00:00
nicm
d0accdba88 Check for NULL session and whatnot in status_replace, from Thomas Adam. 2014-02-14 12:37:54 +00:00
nicm
f58721a9e8 Make C-j the same as C-m, from Simon Nicolussi. 2014-02-14 12:35:58 +00:00
nicm
325396046a Avoid use of uninitialized variable, from Thomas Adam. 2014-02-12 20:26:13 +00:00
nicm
c52548f6fd The last fix to xterm keys meant that some keys such as \033OA were
being wrongly treated as partial matches. So both check xterm keys after
standard keys and only wildcard the minimum required ('1' to
'8'). Problems reported by Ralf Horstmann and Tim van der Molen.
2014-02-10 11:20:41 +00:00
Ben Boeckel
8edbbb9865 Sort and organize option names in tmux.vim
Also update with the latest options and remove the to-be-deprecated
{-attr,-bg,-fg} options.

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
2014-02-05 19:14:12 +00:00
Ben Boeckel
73c125f248 Sort and organize commands in tmux.vim
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
2014-02-05 19:13:11 +00:00
Thomas Adam
1721056f35 Remove references to 88colour support
Tmux doesn't directly support terminals with 88 colours directly anymore.
2014-02-05 10:51:25 +00:00
Thomas
6eef24c37a Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2014-02-05 10:47:57 +00:00
jmc
973de5a704 fix some minor formatting glitches; 2014-02-02 08:48:48 +00:00
Nicholas Marriott
57332be8da Tidy up TODO list. 2014-02-01 00:47:04 +00:00
Thomas Adam
44737b06db Fixup BSD specific things from last merge
There's entries for header files we don't use, and the cvsimport doesn't
like removing files automatically, etc., and it won't have known to have
done this from autoconf's POV, so define that in the correct place, hence
the removal of the previously committed Makefile.
2014-01-31 21:47:54 +00:00
Thomas Adam
d50e47fc4a Merge branch 'obsd-master'
Conflicts:
	Makefile
	cmd-server-info.c
	cmd-start-server.c
2014-01-31 21:39:56 +00:00
nicm
9f02feb9d0 Break up and simplify screen_redraw_screen. 2014-01-31 14:19:24 +00:00
nicm
72d1be5ddd Fix partial matches with xterm-keys on, from m0viefreak dot cm at
googlemail dot com.
2014-01-31 11:20:28 +00:00
nicm
1935eb5c1e Add \033[18t window operations from J Raynor. 2014-01-31 11:17:20 +00:00
nicm
62e0ed5d7e Fix missing argument, stupid last minute changes... 2014-01-28 23:11:44 +00:00
nicm
945339b443 Allow replacing each of the many sets of separate foo-{fg,bg,attr}
options with a single foo-style option. For example:

    set -g status-fg yellow
    set -g status-bg red
    set -g status-attr blink

Becomes:

    set -g status-style fg=yellow,bg=red,blink

The -a flag to set can be used to add to rather than replace a style. So:

    set -g status-bg red

Becomes:

    set -ag status-style bg=red

Currently this is fully backwards compatible (all *-{fg,bg,attr} options
remain) but the plan is to deprecate them over time.

From Tiago Cunha.
2014-01-28 23:07:09 +00:00