From: nicm <nicm@openbsd.org>
Date: Sun, 4 Jun 2017 08:02:20 +0000 (+0000)
Subject: Typo/style; plus man page escaping from jmc.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4d4d49acaead6fe9937ee1ac12162457b0c41818;p=openbsd

Typo/style; plus man page escaping from jmc.
---

diff --git a/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c
index c17bd959d9b..f6b4087c83b 100644
--- a/usr.bin/tmux/screen-write.c
+++ b/usr.bin/tmux/screen-write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-write.c,v 1.126 2017/05/31 17:56:48 nicm Exp $ */
+/* $OpenBSD: screen-write.c,v 1.127 2017/06/04 08:02:20 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1390,7 +1390,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 		}
 	}
 
-	/* Update the selection the flag and set the cell. */
+	/* Update the selected flag and set the cell. */
 	selected = screen_check_selection(s, s->cx, s->cy);
 	if (selected && (~gc->flags & GRID_FLAG_SELECTED)) {
 		memcpy(&tmp_gc, gc, sizeof tmp_gc);
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index c2cdd3f0e58..2522fbae50c 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.556 2017/06/03 17:43:01 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.557 2017/06/04 08:02:20 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 3 2017 $
+.Dd $Mdocdate: June 4 2017 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -1394,7 +1394,7 @@ The following keys may be used in tree mode:
 .It Li "t" Ta "Toggle if item is tagged"
 .It Li "T" Ta "Tag no items"
 .It Li "C-t" Ta "Tag all items"
-.It Li ":" Ta "Run a command for each tagged item"
+.It Li "\&:" Ta "Run a command for each tagged item"
 .It Li "f" Ta "Enter a format to filter items"
 .It Li "O" Ta "Change sort order"
 .It Li "q" Ta "Exit mode"
@@ -3736,7 +3736,7 @@ The flag is one of the following symbols appended to the window name:
 .It Li "*" Ta "Denotes the current window."
 .It Li "-" Ta "Marks the last window (previously selected)."
 .It Li "#" Ta "Window is monitored and activity has been detected."
-.It Li "!" Ta "A bell has occurred in the window."
+.It Li "\&!" Ta "A bell has occurred in the window."
 .It Li "~" Ta "The window has been silent for the monitor-silence interval."
 .It Li "M" Ta "The window contains the marked pane."
 .It Li "Z" Ta "The window's active pane is zoomed."
diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index 8075f19c284..a2b901c97b3 100644
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.288 2017/06/03 07:15:23 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.289 2017/06/04 08:02:20 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1848,7 +1848,7 @@ tty_check_fg(struct tty *tty, const struct window_pane *wp,
 	 */
 	if (~gc->flags & GRID_FLAG_NOPALETTE) {
 		c = gc->fg;
-		if (gc->fg < 8 && gc->attr & GRID_ATTR_BRIGHT)
+		if (c < 8 && gc->attr & GRID_ATTR_BRIGHT)
 			c += 90;
 		if ((c = window_pane_get_palette(wp, c)) != -1)
 			gc->fg = c;