The branch, master has been updated
via 76cb088d16fd5aa47b54428368ef403cbbcf4f5a (commit)
via 88a4da97478ec6b4b2f361315a5a183333d0aa3f (commit)
via 25c430b1cd25d64c52d1c14834957abfaaeb69b6 (commit)
via 772d61f3ed762a50ea4436b7fb70e7024674e6c6 (commit)
via 66f4c60a8477e0cf9eb059e7687ca524f135e442 (commit)
via 2555ac58ccc9b5e9c188dcb3a3a4cce6aa4821d1 (commit)
via e323101edede281b65e3c7141d79afdb2501a8ea (commit)
from 907ad00300506c25ee84223811e25a411dc21517 (commit)
- Log -----------------------------------------------------------------
commit 76cb088d16fd5aa47b54428368ef403cbbcf4f5a
Merge: 907ad00 88a4da9
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Merge branch 'obsd-master'
Conflicts:
tmux.h
cmd.c | 4 ++--
input-keys.c | 2 +-
screen-write.c | 2 +-
screen.c | 8 +++++++-
tmux.1 | 2 +-
tmux.h | 3 +++
6 files changed, 15 insertions(+), 6 deletions(-)
commit 88a4da97478ec6b4b2f361315a5a183333d0aa3f
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Don't let cursor position overflow when reflowing, from Christopher
Collins.
---
screen.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/screen.c b/screen.c
index 754effc..76aa91c 100644
--- a/screen.c
+++ b/screen.c
@@ -365,7 +365,13 @@ void
screen_reflow(struct screen *s, u_int new_x)
{
struct grid *old = s->grid;
+ u_int change;
s->grid = grid_create(old->sx, old->sy, old->hlimit);
- s->cy -= grid_reflow(s->grid, old, new_x);
+
+ change = grid_reflow(s->grid, old, new_x);
+ if (change < s->cy)
+ s->cy -= change;
+ else
+ s->cy = 0;
}
commit 25c430b1cd25d64c52d1c14834957abfaaeb69b6
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Reserve space for \0 in cmd_print, from George Nachman.
---
cmd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmd.c b/cmd.c
index d034870..e7290f2 100644
--- a/cmd.c
+++ b/cmd.c
@@ -295,8 +295,8 @@ cmd_print(struct cmd *cmd, char *buf, size_t len)
size_t off, used;
off = xsnprintf(buf, len, "%s ", cmd->entry->name);
- if (off < len) {
- used = args_print(cmd->args, buf + off, len - off);
+ if (off + 1 < len) {
+ used = args_print(cmd->args, buf + off, len - off - 1);
if (used == 0)
off--;
else
commit 772d61f3ed762a50ea4436b7fb70e7024674e6c6
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
RIS should reset focus reporting, from Hayaki Saito.
---
screen-write.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-write.c b/screen-write.c
index c0935c9..7fcfc5e 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -56,7 +56,7 @@ screen_write_reset(struct screen_write_ctx *ctx)
screen_reset_tabs(s);
screen_write_scrollregion(ctx, 0, screen_size_y(s) - 1);
- s->mode &= ~(MODE_INSERT|MODE_KCURSOR|MODE_KKEYPAD);
+ s->mode &= ~(MODE_INSERT|MODE_KCURSOR|MODE_KKEYPAD|MODE_FOCUSON);
s->mode &= ~(ALL_MOUSE_MODES|MODE_MOUSE_UTF8|MODE_MOUSE_SGR);
screen_write_clearscreen(ctx);
commit 66f4c60a8477e0cf9eb059e7687ca524f135e442
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Don't limit width and height to 222 in standard mouse mode.
---
input-keys.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/input-keys.c b/input-keys.c
index d7e8513..2de48e9 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -227,7 +227,7 @@ input_mouse(struct window_pane *wp, struct session *s,
struct mouse_event *m)
len += utf8_split2(m->x + 33, &buf[len]);
len += utf8_split2(m->y + 33, &buf[len]);
} else {
- if (m->xb > 223 || m->x >= 222 || m->y > 222)
+ if (m->xb > 223)
return;
len = xsnprintf(buf, sizeof buf, "\033[M");
buf[len++] = m->xb + 32;
commit 2555ac58ccc9b5e9c188dcb3a3a4cce6aa4821d1
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
.Op Fl b not .Fl b for run-shell synopsis, from Ben Boeckel.
---
tmux.1 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tmux.1 b/tmux.1
index b38b43b..9b874f7 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3536,7 +3536,7 @@ Lock each client individually by running the command
specified by the
.Ic lock-command
option.
.It Xo Ic run-shell
-.Fl b
+.Op Fl b
.Op Fl t Ar target-pane
.Ar shell-command
.Xc
commit e323101edede281b65e3c7141d79afdb2501a8ea
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Rename global configuration define.
---
server.c | 8 ++++----
tmux.c | 2 +-
tmux.h | 5 ++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/server.c b/server.c
index a07fa1f..ffc25db 100644
--- a/server.c
+++ b/server.c
@@ -169,13 +169,13 @@ server_start(int lockfd, char *lockfile)
cfg_references = 1;
ARRAY_INIT(&cfg_causes);
- if (access(SYSTEM_CFG, R_OK) == 0) {
- if (load_cfg(SYSTEM_CFG, cfg_cmd_q, &cause) == -1) {
- xasprintf(&cause, "%s: %s", SYSTEM_CFG, cause);
+ if (access(TMUX_CONF, R_OK) == 0) {
+ if (load_cfg(TMUX_CONF, cfg_cmd_q, &cause) == -1) {
+ xasprintf(&cause, "%s: %s", TMUX_CONF, cause);
ARRAY_ADD(&cfg_causes, cause);
}
} else if (errno != ENOENT) {
- xasprintf(&cause, "%s: %s", SYSTEM_CFG, strerror(errno));
+ xasprintf(&cause, "%s: %s", TMUX_CONF, strerror(errno));
ARRAY_ADD(&cfg_causes, cause);
}
if (cfg_file != NULL) {
diff --git a/tmux.c b/tmux.c
index e9b28d7..b229967 100644
--- a/tmux.c
+++ b/tmux.c
@@ -357,7 +357,7 @@ main(int argc, char **argv)
if (pw != NULL)
home = pw->pw_dir;
}
- xasprintf(&cfg_file, "%s/%s", home, DEFAULT_CFG);
+ xasprintf(&cfg_file, "%s/.tmux.conf", home);
if (access(cfg_file, R_OK) != 0 && errno == ENOENT) {
free(cfg_file);
cfg_file = NULL;
diff --git a/tmux.h b/tmux.h
index 8fb0622..7404b27 100644
--- a/tmux.h
+++ b/tmux.h
@@ -43,9 +43,8 @@
extern char *__progname;
extern char **environ;
-/* Default configuration files. */
-#define DEFAULT_CFG ".tmux.conf"
-#define SYSTEM_CFG "/etc/tmux.conf"
+/* Default global configuration file. */
+#define TMUX_CONF "/etc/tmux.conf"
/* Default prompt history length. */
#define PROMPT_HISTORY 100
-----------------------------------------------------------------------
Summary of changes:
cmd.c | 4 ++--
input-keys.c | 2 +-
screen-write.c | 2 +-
screen.c | 8 +++++++-
tmux.1 | 2 +-
tmux.h | 3 +++
6 files changed, 15 insertions(+), 6 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
