Attachment 215806 Details for Bug 247248 – v1.1 (emacs)

[patch] v1.1 (emacs)

bug247248.diff (text/plain), 2.58 KB, created by Jan Beich on 2020-06-20 10:18:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-06-20 10:18:36 UTC

Size: 2.58 KB

patch

obsolete

>From 2e3c7b5310a3cb84bf4f41315b0ef48ac136b2a0 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 14 Jun 2020 07:22:08 +0000
>Subject: [PATCH] editors/emacs: backport 24-bit color fix for tty mode
>
>FreeBSD base libncurses is stuck with termcap(5) but setb24/setf24
>capabilities can only be expressed via terminfo(5). Work around via
>environ(7) variable that some terminal emulators define by default.
>
>PR:		247248
>Approved by:	?
>---
> editors/emacs/Makefile            |  2 +-
> editors/emacs/files/patch-tty-rgb | 34 +++++++++++++++++++++++++++++++
> 2 files changed, 35 insertions(+), 1 deletion(-)
> create mode 100644 editors/emacs/files/patch-tty-rgb
>
>diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
>index 37df41b48c7f..57ea6cda40eb 100644
>--- a/editors/emacs/Makefile
>+++ b/editors/emacs/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	emacs
> DISTVERSION=	26.3
>-PORTREVISION=	4
>+PORTREVISION=	5
> PORTEPOCH=	3
> CATEGORIES=	editors
> MASTER_SITES=	GNU
>diff --git a/editors/emacs/files/patch-tty-rgb b/editors/emacs/files/patch-tty-rgb
>new file mode 100644
>index 000000000000..812edf247b57
>--- /dev/null
>+++ b/editors/emacs/files/patch-tty-rgb
>@@ -0,0 +1,34 @@
>+Add RGB fallback if environment has COLORTERM=truecolor
>+https://github.com/emacs-mirror/emacs/commit/50f489b5dc59
>+
>+--- doc/misc/efaq.texi.orig	2019-01-07 14:26:06 UTC
>++++ doc/misc/efaq.texi
>+@@ -1603,6 +1603,10 @@ Currently there's no standard way to determine whether
>+ supports direct color mode.  If such standard arises later on, support
>+ for @samp{setb24} and @samp{setf24} may be removed.
>+ 
>++If Terminfo database is not available, but 24-bit direct color mode is
>++supported, it can still be enabled by defining the environment
>++variable @env{COLORTERM} to @samp{truecolor}.
>++
>+ @node Debugging a customization file
>+ @section How do I debug a @file{.emacs} file?
>+ @cindex Debugging @file{.emacs} file
>+--- src/term.c.orig	2019-01-07 14:26:07 UTC
>++++ src/term.c
>+@@ -4157,6 +4157,15 @@ use the Bourne shell command 'TERM=...; export TERM' (
>+ 	    tty->TS_set_background = bg;
>+ 	    tty->TN_max_colors = 16777216;
>+ 	  }
>++	/* Fall back to xterm+direct (semicolon version) if requested
>++	   by the COLORTERM environment variable.  */
>++	else if ((bg = getenv("COLORTERM")) != NULL
>++		 && strcasecmp(bg, "truecolor") == 0)
>++	  {
>++	    tty->TS_set_foreground = "\033[%?%p1%{8}%<%t3%p1%d%e38;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m";
>++	    tty->TS_set_background = "\033[%?%p1%{8}%<%t4%p1%d%e48;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m";
>++	    tty->TN_max_colors = 16777216;
>++	  }
>+       }
>+ #endif
>+

Actions: View | Diff

Attachments on bug 247248: 215536 | 215806 | 215807