The branch, master has been updated
discards 7b189f1ad78e8ad96a6896b2640fc0bbd3003201 (commit)
discards 5d60bc7f7c43c20fcf65531b5a5fb1fc7dcbb338 (commit)
discards 5b85efeb93d44e504e36ae06a91c2e1b8b82c50e (commit)
via e342304134b8012ae62cb627dc9e322411dd48b1 (commit)
via d785c37ee277457433daf1553424b1d815f9e2f9 (commit)
via 69683ba7b453c8460c6cd6fbff1e4ef210d34ed1 (commit)
via 84612a8196341839c5a18362b68047aa1b011a50 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (7b189f1ad78e8ad96a6896b2640fc0bbd3003201)
\
N -- N -- N (e342304134b8012ae62cb627dc9e322411dd48b1)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
- Log -----------------------------------------------------------------
commit e342304134b8012ae62cb627dc9e322411dd48b1
Merge: d785c37 84612a8
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Merge branch 'obsd-master'
Conflicts:
cmd.c
format.c
osdep-openbsd.c
tmux.h
control.c | 9 +++++++++
osdep-openbsd.c | 4 +++-
tmux.h | 1 +
3 files changed, 13 insertions(+), 1 deletions(-)
diff --cc osdep-openbsd.c
index 4fb75bf,1928b92..402b501
--- a/osdep-openbsd.c
+++ b/osdep-openbsd.c
@@@ -135,9 -133,9 +135,9 @@@ error
}
char*
-get_proc_cwd(int fd)
+osdep_get_cwd(pid_t pid)
{
- int name[] = { CTL_KERN, KERN_PROC_CWD, (int)pid };
+ int name[] = { CTL_KERN, KERN_PROC_CWD, 0 };
static char path[MAXPATHLEN];
size_t pathlen = sizeof path;
commit d785c37ee277457433daf1553424b1d815f9e2f9
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Thomas Adam <tho...@xteddy.org>
Fix some UTF-8 Japanese issue on OS X, SF bug 3566884.
---
utf8.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/utf8.c b/utf8.c
index 7fb1181..88d847a 100644
--- a/utf8.c
+++ b/utf8.c
@@ -135,7 +135,9 @@ struct utf8_width_entry utf8_width_table[] = {
{ 0x0135f, 0x0135f, 0, NULL, NULL },
{ 0x01a17, 0x01a18, 0, NULL, NULL },
{ 0x006e7, 0x006e8, 0, NULL, NULL },
+#ifndef __APPLE__
{ 0x03099, 0x0309a, 0, NULL, NULL },
+#endif
{ 0x00b4d, 0x00b4d, 0, NULL, NULL },
{ 0x00ce2, 0x00ce3, 0, NULL, NULL },
{ 0x00bcd, 0x00bcd, 0, NULL, NULL },
commit 69683ba7b453c8460c6cd6fbff1e4ef210d34ed1
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Thomas Adam <tho...@xteddy.org>
Use ACS characters for choose-tree arrows based on diff from Romain
Francoise.
---
cmd-choose-tree.c | 6 ++++--
screen-write.c | 8 ++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index dd6dd3b..e8da7a4 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -149,8 +149,10 @@ cmd_choose_tree_exec(struct cmd *self, struct cmd_ctx *ctx)
* without any padding.
*/
if (wflag && sflag) {
- xasprintf(&final_win_template_middle, " |-> %s", win_template);
- xasprintf(&final_win_template_last, " \\-> %s", win_template);
+ xasprintf(&final_win_template_middle,
+ " \001tq\001> %s", win_template);
+ xasprintf(&final_win_template_last,
+ " \001mq\001> %s", win_template);
} else if (wflag) {
final_win_template_middle = xstrdup(win_template);
final_win_template_last = xstrdup(win_template);
diff --git a/screen-write.c b/screen-write.c
index 2b373d7..66a62b3 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -210,8 +210,12 @@ screen_write_vnputs(struct screen_write_ctx *ctx, ssize_t
maxlen,
if (maxlen > 0 && size + 1 > (size_t) maxlen)
break;
- size++;
- screen_write_putc(ctx, gc, *ptr);
+ if (*ptr == '\001')
+ gc->attr ^= GRID_ATTR_CHARSET;
+ else {
+ size++;
+ screen_write_putc(ctx, gc, *ptr);
+ }
ptr++;
}
}
commit 84612a8196341839c5a18362b68047aa1b011a50
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Add control_write_buffer, from George Nachman.
---
control.c | 9 +++++++++
tmux.h | 1 +
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/control.c b/control.c
index c0d9e81..cb6633c 100644
--- a/control.c
+++ b/control.c
@@ -79,6 +79,15 @@ control_write(struct client *c, const char *fmt, ...)
server_push_stdout(c);
}
+/* Write a buffer, adding a terminal newline. Empties buffer. */
+void
+control_write_buffer(struct client *c, struct evbuffer *buffer)
+{
+ evbuffer_add_buffer(c->stdout_data, buffer);
+ evbuffer_add(c->stdout_data, "\n", 1);
+ server_push_stdout(c);
+}
+
/* Control input callback. Read lines and fire commands. */
void
control_callback(struct client *c, int closed, unused void *data)
diff --git a/tmux.h b/tmux.h
index 90019bf..b1e1eee 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2221,6 +2221,7 @@ void clear_signals(int);
/* control.c */
void control_callback(struct client *, int, void*);
void printflike2 control_write(struct client *, const char *, ...);
+void control_write_buffer(struct client *, struct evbuffer *);
/* control-notify.c */
void control_notify_window_layout_changed(struct window *);
-----------------------------------------------------------------------
Summary of changes:
cmd-choose-tree.c | 6 ++++--
cmd.c | 2 +-
control.c | 9 +++++++++
format.c | 2 +-
osdep-aix.c | 2 +-
osdep-darwin.c | 10 +++-------
osdep-dragonfly.c | 4 ++--
osdep-freebsd.c | 10 +++-------
osdep-hpux.c | 2 +-
osdep-linux.c | 8 ++------
osdep-netbsd.c | 4 ++--
osdep-openbsd.c | 4 ++--
osdep-sunos.c | 8 ++------
osdep-unknown.c | 2 +-
screen-write.c | 8 ++++++--
tmux.h | 3 ++-
16 files changed, 42 insertions(+), 42 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
