summaryrefslogtreecommitdiffstats
path: root/debian/patches/upstream-bf636d9575.diff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 03:34:38 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 03:34:38 +0000
commitdf7e23e93574873618aee45820803ee4c38d9698 (patch)
treee4772d1825878a561dec4bf04262aff22cc8cef1 /debian/patches/upstream-bf636d9575.diff
parentAdding upstream version 3.3a. (diff)
downloadtmux-df7e23e93574873618aee45820803ee4c38d9698.tar.xz
tmux-df7e23e93574873618aee45820803ee4c38d9698.zip
Adding debian version 3.3a-5.debian/3.3a-5
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/upstream-bf636d9575.diff')
-rw-r--r--debian/patches/upstream-bf636d9575.diff77
1 files changed, 77 insertions, 0 deletions
diff --git a/debian/patches/upstream-bf636d9575.diff b/debian/patches/upstream-bf636d9575.diff
new file mode 100644
index 0000000..551b36b
--- /dev/null
+++ b/debian/patches/upstream-bf636d9575.diff
@@ -0,0 +1,77 @@
+From 624b9567c70976766065c826b73234925b052595 Mon Sep 17 00:00:00 2001
+From: nicm <nicm>
+Date: Fri, 28 Apr 2023 05:59:35 +0000
+Subject: [PATCH 4/4] Do not fatal if tparm fails, instead just log it (not
+ working sequences are better than exiting).
+
+---
+ tty-term.c | 32 ++++++++++++++++++++++----------
+ 1 file changed, 22 insertions(+), 10 deletions(-)
+
+--- a/tty-term.c
++++ b/tty-term.c
+@@ -771,8 +771,10 @@
+ #else
+ s = tparm((char *)x, a, 0, 0, 0, 0, 0, 0, 0, 0);
+ #endif
+- if (s == NULL)
+- fatalx("could not expand %s", tty_term_codes[code].name);
++ if (s == NULL) {
++ log_debug("could not expand %s", tty_term_codes[code].name);
++ return ("");
++ }
+ return (s);
+ }
+
+@@ -788,8 +790,10 @@
+ #else
+ s = tparm((char *)x, a, b, 0, 0, 0, 0, 0, 0, 0);
+ #endif
+- if (s == NULL)
+- fatalx("could not expand %s", tty_term_codes[code].name);
++ if (s == NULL) {
++ log_debug("could not expand %s", tty_term_codes[code].name);
++ return ("");
++ }
+ return (s);
+ }
+
+@@ -806,8 +810,10 @@
+ #else
+ s = tparm((char *)x, a, b, c, 0, 0, 0, 0, 0, 0);
+ #endif
+- if (s == NULL)
+- fatalx("could not expand %s", tty_term_codes[code].name);
++ if (s == NULL) {
++ log_debug("could not expand %s", tty_term_codes[code].name);
++ return ("");
++ }
+ return (s);
+ }
+
+@@ -823,8 +829,10 @@
+ #else
+ s = tparm((char *)x, (long)a, 0, 0, 0, 0, 0, 0, 0, 0);
+ #endif
+- if (s == NULL)
+- fatalx("could not expand %s", tty_term_codes[code].name);
++ if (s == NULL) {
++ log_debug("could not expand %s", tty_term_codes[code].name);
++ return ("");
++ }
+ return (s);
+ }
+
+@@ -841,8 +849,10 @@
+ #else
+ s = tparm((char *)x, (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0);
+ #endif
+- if (s == NULL)
+- fatalx("could not expand %s", tty_term_codes[code].name);
++ if (s == NULL) {
++ log_debug("could not expand %s", tty_term_codes[code].name);
++ return ("");
++ }
+ return (s);
+ }
+