summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRay Song2016-03-30 16:21:12 +0800
committerRay Song2016-03-30 16:21:12 +0800
commit7e3b0de43d900ae852a3f83c9d75c92d29c9c58e (patch)
tree4692289726ea04b834b289a8b8b3b925be36a7da
parentd9aa2f514ec8dc37d4860b2f3087f5acb322053a (diff)
downloadaur-7e3b0de43d900ae852a3f83c9d75c92d29c9c58e.tar.gz
bugfix
-rw-r--r--PKGBUILD2
-rw-r--r--fullwidth-backspace.patch6
2 files changed, 4 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index b0211b5a20a0..a61eb07a0840 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ provides=('tmux')
conflicts=('tmux')
md5sums=('74a2855695bccb51b6e301383ad4818c'
'71601bc37fa44e4395580b321963018e'
- 'b1377bfcce58b627c5cfa32913493cf6')
+ '2bb338d95e88265689f5b981c317b6a3')
prepare() {
patch -p1 < ../fullwidth-backspace.patch
diff --git a/fullwidth-backspace.patch b/fullwidth-backspace.patch
index 4d6cd57afd48..f519417ce384 100644
--- a/fullwidth-backspace.patch
+++ b/fullwidth-backspace.patch
@@ -20,12 +20,12 @@
- s->cx--;
+ } else {
+ struct termios tio;
-+ int fd = open(ctx->wp->tty, O_RDONLY);
++ int fd = open(ctx->wp->tty, O_RDONLY);
+ assert(tcgetattr(fd, &tio) == 0);
-+ close(fd);
++ close(fd);
+ if (tio.c_lflag & ICANON && tio.c_iflag & IUTF8) {
+ gl = &s->grid->linedata[s->grid->hsize + s->cy];
-+ if (s->cx >= 2 && grid_cell_width(&gl->celldata[s->cx-2]) == 2)
++ if (s->cx >= 2 && s->cx-2 < gl->cellsize && grid_cell_width(&gl->celldata[s->cx-2]) == 2)
+ s->cx -= 2;
+ else
+ s->cx--;