svn commit: r394577 - in head/sysutils/tmux: . files
Raphael Kubo da Costa
rakuco at FreeBSD.org
Tue Aug 18 11:32:40 UTC 2015
Author: rakuco
Date: Tue Aug 18 11:32:38 2015
New Revision: 394577
URL: https://svnweb.freebsd.org/changeset/ports/394577
Log:
Import upstream commit to make emacs-in-tmux-in-tmux show cursor.
Import upstream commit 2c53b23d59 to make the cursor appear when running
Emacs in a tmux nested inside another tmux session (this is particularly
useful when trying to edit a text file on a remote server that is also
running tmux).
Approved by: mat (maintainer)
Differential Revision: https://reviews.freebsd.org/D3408
Added:
head/sysutils/tmux/files/patch-git_2c53b23d (contents, props changed)
Modified:
head/sysutils/tmux/Makefile
Modified: head/sysutils/tmux/Makefile
==============================================================================
--- head/sysutils/tmux/Makefile Tue Aug 18 11:11:22 2015 (r394576)
+++ head/sysutils/tmux/Makefile Tue Aug 18 11:32:38 2015 (r394577)
@@ -3,6 +3,7 @@
PORTNAME= tmux
PORTVERSION= 2.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//}
Added: head/sysutils/tmux/files/patch-git_2c53b23d
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/tmux/files/patch-git_2c53b23d Tue Aug 18 11:32:38 2015 (r394577)
@@ -0,0 +1,35 @@
+commit 2c53b23d5968da2e796ead6ed9f8ff3c33b8bbfb
+Author: nicm <nicm>
+Date: Tue May 19 08:48:37 2015 +0000
+
+ In terminfo, sometimes cvvis implies cnorm and sometimes it doesn't, so
+ don't assume it does. Fixes missing cursor with emacs-in-tmux-in-tmux.
+
+--- tty.c
++++ tty.c
+@@ -507,14 +507,17 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
+ mode &= ~MODE_CURSOR;
+
+ changed = mode ^ tty->mode;
+- if (changed & (MODE_CURSOR|MODE_BLINKING)) {
+- if (mode & MODE_CURSOR) {
+- if (mode & MODE_BLINKING &&
+- tty_term_has(tty->term, TTYC_CVVIS))
+- tty_putcode(tty, TTYC_CVVIS);
+- else
+- tty_putcode(tty, TTYC_CNORM);
+- } else
++ if (changed & MODE_BLINKING) {
++ if (tty_term_has(tty->term, TTYC_CVVIS))
++ tty_putcode(tty, TTYC_CVVIS);
++ else
++ tty_putcode(tty, TTYC_CNORM);
++ changed |= MODE_CURSOR;
++ }
++ if (changed & MODE_CURSOR) {
++ if (mode & MODE_CURSOR)
++ tty_putcode(tty, TTYC_CNORM);
++ else
+ tty_putcode(tty, TTYC_CIVIS);
+ }
+ if (s != NULL && tty->cstyle != s->cstyle) {
More information about the svn-ports-all
mailing list