summaryrefslogtreecommitdiff
path: root/app/xterm/button.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2012-06-07 20:20:25 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2012-06-07 20:20:25 +0000
commit6a69937862dae0dcad84f30dbe32767c5a3eb149 (patch)
tree53557e77ac2b3ab2cc0dd8939331aa8b7b27017d /app/xterm/button.c
parenta64d53a3cd043209550978ba9e9b8d5c21725516 (diff)
Update to xterm 279. Tested by krw@, mpi@, shadchin@.
Diffstat (limited to 'app/xterm/button.c')
-rw-r--r--app/xterm/button.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/app/xterm/button.c b/app/xterm/button.c
index d3c44e4fb..cdf05b318 100644
--- a/app/xterm/button.c
+++ b/app/xterm/button.c
@@ -1,7 +1,7 @@
-/* $XTermId: button.c,v 1.430 2012/01/07 02:00:35 tom Exp $ */
+/* $XTermId: button.c,v 1.434 2012/05/10 11:06:10 tom Exp $ */
/*
- * Copyright 1999-2010,2011 by Thomas E. Dickey
+ * Copyright 1999-2011,2012 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -2597,14 +2597,14 @@ ScrollSelection(TScreen * screen, int amount, Bool always)
adjust = ROW2INX(screen, screen->startH.row);
if (always
- || !ScrnHaveLineMargins(screen)
- || ScrnIsLineInMargins(screen, adjust)) {
+ || !ScrnHaveRowMargins(screen)
+ || ScrnIsRowInMargins(screen, adjust)) {
scroll_update_one(&screen->startH);
}
adjust = ROW2INX(screen, screen->endH.row);
if (always
- || !ScrnHaveLineMargins(screen)
- || ScrnIsLineInMargins(screen, adjust)) {
+ || !ScrnHaveRowMargins(screen)
+ || ScrnIsRowInMargins(screen, adjust)) {
scroll_update_one(&screen->endH);
}
}
@@ -2730,7 +2730,7 @@ static int charClass[256] =
{
/* NUL SOH STX ETX EOT ENQ ACK BEL */
32, 1, 1, 1, 1, 1, 1, 1,
-/* BS HT NL VT NP CR SO SI */
+/* BS HT NL VT FF CR SO SI */
1, 32, 1, 1, 1, 1, 1, 1,
/* DLE DC1 DC2 DC3 DC4 NAK SYN ETB */
1, 1, 1, 1, 1, 1, 1, 1,
@@ -4673,8 +4673,7 @@ formatVideoAttrs(XtermWidget xw, char *buffer, CELL * cell)
buffer += sprintf(buffer, "%s48;5", delim);
delim = ";";
}
- buffer += sprintf(buffer, "%s%u", delim, bg);
- delim = ";";
+ (void) sprintf(buffer, "%s%u", delim, bg);
}
#endif
}