The branch, master has been updated
via 80d9964a309e6a8f9ec9fb9375574f1d24350abf (commit)
via 150ef868008385a79278a5a3d16169c16b2d880a (commit)
via 315d45a0eb596048f2513dab98e4bb47ec1852a4 (commit)
via c7f3599ebca82fcd1c2a00de234f90ac1f5f0ede (commit)
from 2a412fad044e402391a1c82dc600ce03c7ce2bc5 (commit)
- Log -----------------------------------------------------------------
commit 80d9964a309e6a8f9ec9fb9375574f1d24350abf
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Update CHANGES and configure.ac for 1.9a release
---
CHANGES | 11 +++++++++++
configure.ac | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/CHANGES b/CHANGES
index 17d4d2a..9240272 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+CHANGES FROM 1.9 to 1.9a 22 February 2014
+
+NOTE: This is a bug-fix release to address some important bugs which just
+missed the 1.9 deadline, but were found afterwards.
+
+Normal Changes
+==============
+
+* Fix crash due to uninitialized lastwp member of layout_cell
+* Fix -fg/-bg/-style with 256 colour terminals.
+
CHANGES FROM 1.8 to 1.9, 20 February 2014
NOTE: This release has bumped the tmux protocol version. It is therefore
diff --git a/configure.ac b/configure.ac
index fec7904..994b228 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# $Id$
# Miscellaneous autofoo bullshit.
-AC_INIT(tmux, 1.10)
+AC_INIT(tmux, 1.9a)
AC_CONFIG_AUX_DIR(etc)
AM_INIT_AUTOMAKE([foreign subdir-objects])
@@ -45,7 +45,7 @@ AC_CHECK_HEADERS(
)
# Is this a debug build?
-found_debug=yes
+#found_debug=yes
AC_ARG_ENABLE(
debug,
AC_HELP_STRING(--enable-debug, create a debug build),
commit 150ef868008385a79278a5a3d16169c16b2d880a
Merge: 2a412fa 315d45a
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Merge branch 'obsd-master'
layout.c | 1 +
style.c | 26 ++++++++++++++++++++------
window.c | 5 +++--
3 files changed, 24 insertions(+), 8 deletions(-)
commit 315d45a0eb596048f2513dab98e4bb47ec1852a4
Author: nicm <nicm>
Commit: nicm <nicm>
Fix crash due to uninitialized lastwp member of layout_cell, reported by
Balazs Kezes.
---
layout.c | 1 +
window.c | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/layout.c b/layout.c
index b91b86c..1c76f98 100644
--- a/layout.c
+++ b/layout.c
@@ -53,6 +53,7 @@ layout_create_cell(struct layout_cell *lcparent)
lc->yoff = UINT_MAX;
lc->wp = NULL;
+ lc->lastwp = NULL;
return (lc);
}
diff --git a/window.c b/window.c
index 1e11cac..842a5c6 100644
--- a/window.c
+++ b/window.c
@@ -410,8 +410,9 @@ window_pane_active_set(struct window_pane *wp, struct
window_pane *nextwp)
* Previously active pane, if any, must not be the same as the source
* pane.
*/
- if (nextwp->layout_cell->parent != NULL) {
- lastwp = nextwp->layout_cell->parent->lastwp;
+ lc = nextwp->layout_cell->parent;
+ if (lc != NULL && lc->lastwp != NULL) {
+ lastwp = lc->lastwp;
if (lastwp != wp && window_pane_visible(lastwp))
return (lastwp);
}
commit c7f3599ebca82fcd1c2a00de234f90ac1f5f0ede
Author: nicm <nicm>
Commit: nicm <nicm>
Fix -fg/-bg/-style with 256 colour terminals.
---
style.c | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/style.c b/style.c
index 97d5576..9974408 100644
--- a/style.c
+++ b/style.c
@@ -203,8 +203,14 @@ style_apply(struct grid_cell *gc, struct options *oo,
const char *name)
memcpy(gc, &grid_default_cell, sizeof *gc);
gcp = options_get_style(oo, name);
- colour_set_fg(gc, gcp->fg);
- colour_set_bg(gc, gcp->bg);
+ if (gcp->flags & GRID_FLAG_FG256)
+ colour_set_fg(gc, gcp->fg | 0x100);
+ else
+ colour_set_fg(gc, gcp->fg);
+ if (gcp->flags & GRID_FLAG_BG256)
+ colour_set_bg(gc, gcp->bg | 0x100);
+ else
+ colour_set_bg(gc, gcp->bg);
gc->attr |= gcp->attr;
}
@@ -215,10 +221,18 @@ style_apply_update(struct grid_cell *gc, struct options
*oo, const char *name)
struct grid_cell *gcp;
gcp = options_get_style(oo, name);
- if (gcp->fg != 8)
- colour_set_fg(gc, gcp->fg);
- if (gcp->bg != 8)
- colour_set_bg(gc, gcp->bg);
+ if (gcp->fg != 8) {
+ if (gcp->flags & GRID_FLAG_FG256)
+ colour_set_fg(gc, gcp->fg | 0x100);
+ else
+ colour_set_fg(gc, gcp->fg);
+ }
+ if (gcp->bg != 8) {
+ if (gcp->flags & GRID_FLAG_BG256)
+ colour_set_bg(gc, gcp->bg | 0x100);
+ else
+ colour_set_bg(gc, gcp->bg);
+ }
if (gcp->attr != 0)
gc->attr |= gcp->attr;
}
-----------------------------------------------------------------------
Summary of changes:
CHANGES | 11 +++++++++++
configure.ac | 4 ++--
layout.c | 1 +
style.c | 26 ++++++++++++++++++++------
window.c | 5 +++--
5 files changed, 37 insertions(+), 10 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
