Permalink
Browse files

Merge branch 'experimental'

* experimental: (26 commits)
  Update debian/changelog
  Refresh debian/patches/lintian-manpage-hyphen.diff
  Import upstream snapshot from SVN r2670
  Update debian/changelog
  Refresh, clean up and add DEP-3 headers to patches
  Disable cwd detection in FreeBSD osdep code
  Drop useless hunk from debian/patches/05_build_kfreebsd_hurd.diff
  Update debian/changelog
  Import upstream snapshot from SVN r2647
  Update debian/changelog
  Import upstream snapshot from SVN r2642
  debian/rules: Add -Wl,--as-needed to LDFLAGS
  Update debian/changelog
  Enable parallel build in debhelper
  Override lintian warning about dh compat level 9
  Switch to dpkg-buildflags for build flags handling
  Update debian/changelog
  Import upstream snapshot from SVN r2630
  Update debian/changelog
  Add /usr/bin/tmux to /etc/shells (#644813)
  ...

Conflicts:
	debian/patches/series
	debian/postinst
  • Loading branch information...
2 parents a21d335 + 7d1d025 commit 6f987f581b3b2185f653d0a3759e09aad6c35caf @rfrancoise rfrancoise committed Jan 23, 2012
Showing with 4,197 additions and 1,764 deletions.
  1. +5 −6 Makefile.am
  2. +248 −177 Makefile.in
  3. +11 −1 NOTES
  4. +14 −7 TODO
  5. +257 −49 aclocal.m4
  6. +28 −9 cfg.c
  7. +3 −1 cmd-attach-session.c
  8. +3 −3 cmd-bind-key.c
  9. +4 −3 cmd-capture-pane.c
  10. +5 −3 cmd-choose-client.c
  11. +23 −13 cmd-if-shell.c
  12. +30 −17 cmd-list-clients.c
  13. +6 −6 cmd-list-keys.c
  14. +53 −47 cmd-list-panes.c
  15. +27 −22 cmd-list-sessions.c
  16. +50 −25 cmd-list-windows.c
  17. +18 −3 cmd-load-buffer.c
  18. +10 −8 cmd-new-session.c
  19. +4 −9 cmd-new-window.c
  20. +3 −5 cmd-pipe-pane.c
  21. +8 −4 cmd-refresh-client.c
  22. +6 −3 cmd-respawn-pane.c
  23. +18 −3 cmd-save-buffer.c
  24. +21 −3 cmd-send-keys.c
  25. +9 −6 cmd-send-prefix.c
  26. +2 −2 cmd-set-buffer.c
  27. +12 −24 cmd-set-option.c
  28. +2 −2 cmd-show-buffer.c
  29. +12 −15 cmd-split-window.c
  30. +15 −4 cmd-switch-client.c
  31. +6 −8 cmd-unbind-key.c
  32. +33 −1 cmd.c
  33. +46 −8 colour.c
  34. +6 −1 compat.h
  35. +5 −2 compat/asprintf.c
  36. +182 −0 compat/b64_ntop.c
  37. +890 −632 configure
  38. +71 −26 configure.ac
  39. +60 −0 debian/changelog
  40. +0 −16 debian/patches/01_no_epoll.diff
  41. +0 −44 debian/patches/05_build_kfreebsd_hurd.diff
  42. +0 −19 debian/patches/99_upstream.diff
  43. +18 −13 debian/patches/{07_fix_hyphen.diff → lintian-manpage-hyphen.diff}
  44. +75 −0 debian/patches/platform-quirks.diff
  45. +2 −4 debian/patches/series
  46. +1 −2 etc/compile
  47. +119 −103 etc/config.guess
  48. +107 −52 etc/config.sub
  49. +1 −3 etc/depcomp
  50. +1 −3 etc/missing
  51. +1 −1 examples/screen-keys.conf
  52. +12 −9 examples/tmux.vim
  53. +393 −0 format.c
  54. +4 −2 input-keys.c
  55. +41 −13 input.c
  56. +10 −10 key-bindings.c
  57. +9 −1 key-string.c
  58. +3 −3 layout-set.c
  59. +44 −11 mode-key.c
  60. +83 −25 options-table.c
  61. +12 −53 options.c
  62. +7 −1 osdep-aix.c
  63. +8 −1 osdep-darwin.c
  64. +133 −0 osdep-dragonfly.c
  65. +25 −1 osdep-freebsd.c
  66. +7 −1 osdep-hpux.c
  67. +18 −1 osdep-linux.c
  68. +8 −1 osdep-netbsd.c
  69. +14 −1 osdep-openbsd.c
  70. +20 −4 osdep-sunos.c
  71. +7 −1 osdep-unknown.c
  72. +4 −3 screen-redraw.c
  73. +30 −1 screen-write.c
  74. +11 −11 server-client.c
  75. +20 −3 server-fn.c
  76. +11 −9 server-window.c
  77. +12 −5 session.c
  78. +154 −13 status.c
  79. +331 −86 tmux.1
  80. +22 −11 tmux.c
  81. +52 −21 tmux.h
  82. +4 −1 tty-term.c
  83. +15 −6 tty.c
  84. +125 −26 window-copy.c
  85. +17 −11 window.c
View
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 2556 2011-07-09 13:45:24Z tcunha $
+# $Id: Makefile.am 2592 2011-09-21 16:32:31Z tcunha $
# Obvious program stuff.
bin_PROGRAMS = tmux
@@ -43,11 +43,6 @@ CPPFLAGS += -I. -I- -I/usr/local/include
endif
endif
-# Set flags for static.
-if IS_STATIC
-LDFLAGS += -static
-endif
-
# Set flags for Solaris.
if IS_SUNOS
CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
@@ -141,6 +136,7 @@ dist_tmux_SOURCES = \
cmd.c \
colour.c \
environ.c \
+ format.c \
grid-utf8.c \
grid-view.c \
grid.c \
@@ -226,6 +222,9 @@ endif
if NO_STRTONUM
nodist_tmux_SOURCES += compat/strtonum.c
endif
+if NO_B64_NTOP
+nodist_tmux_SOURCES += compat/b64_ntop.c
+endif
# Update SF web site.
upload-index.html: update-index.html
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
12 NOTES
@@ -13,6 +13,16 @@ Since the 1.2 release that tmux depends on libevent. Download it from:
http://www.monkey.org/~provos/libevent/
+To build tmux from a release tarball, do:
+
+ $ ./configure && make
+ $ sudo make install
+
+To build from a version control checkout, the configure script must be
+generated by running:
+
+ $ sh autogen.sh
+
tmux consists of a server part and multiple clients. The server is created when
required and runs continuously unless killed by the user. Clients access the
server through a socket in /tmp. Multiple sessions may be created on a single
@@ -62,4 +72,4 @@ start. Please contact me with any queries.
-- Nicholas Marriott <nicm@users.sf.net>
-$Id: NOTES 2553 2011-07-09 09:42:33Z tcunha $
+$Id: NOTES 2590 2011-09-15 12:58:39Z nicm $
View
21 TODO
@@ -100,7 +100,6 @@
and a buffer) info() when changing to same window
- way to add dest for break-pane; maybe some easier way to unbreak-pane
- case insensitive searching
-- pane-index option like base-index
- option to move status line to top
- configurable borders and empty space filler for when panes < window?
- mouse-select-pane will screw up with !MODE_MOUSE_STANDARD (it sets the
@@ -113,10 +112,6 @@
in commands without quotes
- a command to choose from a generic list, so you can do eg
choose-list -l Abc,Moo,Blah "run-shell 'sh /my/choose/script %%'"
-- else part for if-shell
-- add general internal format for lists (key=value) and a way to output them in
- different representations, use for list-windows, etc etc. see message id
- 20110221205346.GA1580@yelena.nicm.ath.cx
- numeric prefix in copy mode should be paste buffer for C-w
- named buffers and allow gaps in the stack
- npage/ppage/dc/ic should have aliases for more typical names
@@ -128,13 +123,25 @@
- monitor-activity is broken in several ways with multiple clients
- monitor-activity should be more powerful (eg set a region)
- maybe a way to put pane names instead of window names in status line
-- Support for borderless panes
+- support for borderless panes
- run-shell/if-shell should support status_replace stuff
- wait-pane command or another way to make it synchronous/wait for command to
finish
-- way to get command window was started with (part of format stuff?)
- last-pane across sessions
- attach should take a pane and select it as well as attaching
+- should default-path be a window option?
+- option to put status line at top (why?)
+- panes should have names like windows
+- command-prompt doesn't work if made read-only. why?
+- option to quote format eg #{session_name:quoted}
+- formats need to be used for much much more stuff!
+- formats need conditions for >0 (for #P)
+- flags to find-window to select what is searched (title, name, content, history)
+- fetch full command line on !Linux, and add option to strip prefixes
+ such as "sh " "/bin/sh " etc etc
+- synchronize-windows option
+- possibly support rxvt-unicode extended mouse input (1015)
+- append to buffer in copy mode
* We need a tmux terminfo entry to document the extensions we are using in
upstream terminfo. Must NOT change (only add or remove) anything from
TERM=screen so we can fallback!
Oops, something went wrong.

0 comments on commit 6f987f5

Please sign in to comment.