summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFangrui Song2017-04-25 23:05:08 -0700
committerFangrui Song2017-04-25 23:05:08 -0700
commit15b70352adc869196764bbf057945eb5ce6f0032 (patch)
tree6d49710dbd00974526ce5e719d752aa75ec63cad
parenta243aa72682195c757dcc7c2136159a1240313c6 (diff)
downloadaur-15b70352adc869196764bbf057945eb5ce6f0032.tar.gz
bump to 2.4
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD6
-rw-r--r--fullwidth-backspace.patch2
3 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 67a6bc334da5..457adab7ae22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = tmux-fullwidth-backspace
pkgdesc = A terminal multiplexer (patched with support for fullwidth backspace)
- pkgver = 2.3
+ pkgver = 2.4
pkgrel = 1
url = http://tmux.github.io/
arch = i686
@@ -11,12 +11,12 @@ pkgbase = tmux-fullwidth-backspace
depends = libutempter
provides = tmux
conflicts = tmux
- source = https://github.com/tmux/tmux/releases/download/2.3/tmux-2.3.tar.gz
+ source = https://github.com/tmux/tmux/releases/download/2.4/tmux-2.4.tar.gz
source = LICENSE
source = fullwidth-backspace.patch
- md5sums = fcfd1611d705d8b31df3c26ebc93bd3e
+ md5sums = 6165d3aca811a3225ef8afbd1afcf1c5
md5sums = 71601bc37fa44e4395580b321963018e
- md5sums = 9110efa8524cb8e34c8f7976a11318c1
+ md5sums = d94a3a131ae12cc227cb76b627451d7a
pkgname = tmux-fullwidth-backspace
diff --git a/PKGBUILD b/PKGBUILD
index 6b3f2310d2d3..58ae7b95116d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Ray Song <i@maskray.me>
pkgname=tmux-fullwidth-backspace
-pkgver=2.3
+pkgver=2.4
pkgrel=1
pkgdesc='A terminal multiplexer (patched with support for fullwidth backspace)'
url='http://tmux.github.io/'
@@ -12,9 +12,9 @@ source=(https://github.com/tmux/tmux/releases/download/$pkgver/tmux-$pkgver.tar.
LICENSE fullwidth-backspace.patch)
provides=('tmux')
conflicts=('tmux')
-md5sums=('fcfd1611d705d8b31df3c26ebc93bd3e'
+md5sums=('6165d3aca811a3225ef8afbd1afcf1c5'
'71601bc37fa44e4395580b321963018e'
- '9110efa8524cb8e34c8f7976a11318c1')
+ 'd94a3a131ae12cc227cb76b627451d7a')
prepare() {
cd "$srcdir/tmux-${pkgver/_/}"
diff --git a/fullwidth-backspace.patch b/fullwidth-backspace.patch
index d29325c7437d..54188074dbff 100644
--- a/fullwidth-backspace.patch
+++ b/fullwidth-backspace.patch
@@ -25,7 +25,7 @@ index e58d744..eabfa6d 100644
+ int fd = open(ctx->wp->tty, O_RDONLY);
+ assert(tcgetattr(fd, &tio) == 0);
+ close(fd);
-+ if (tio.c_lflag & ICANON && tio.c_iflag & IUTF8) {
++ if (tio.c_lflag & ICANON && tio.c_iflag & IUTF8 && ctx->wp->mode != &window_copy_mode) {
+ gl = &s->grid->linedata[s->grid->hsize + s->cy];
+ if (s->cx > 0 && s->cx-1 < gl->extdsize && gl->extddata[s->cx-1].data.width == 2)
+ s->cx -= 2;