From 091a6d59fa6d304c4e5c50db4b4f8a8f6ef8b19c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 11 Jun 2024 18:45:35 +0200 Subject: Merging debian version 3.4-6. Signed-off-by: Daniel Baumann --- debian/patches/upstream-692ce59bce.diff | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 debian/patches/upstream-692ce59bce.diff (limited to 'debian/patches/upstream-692ce59bce.diff') diff --git a/debian/patches/upstream-692ce59bce.diff b/debian/patches/upstream-692ce59bce.diff new file mode 100644 index 0000000..89d4748 --- /dev/null +++ b/debian/patches/upstream-692ce59bce.diff @@ -0,0 +1,23 @@ +commit 692ce59bcef5fcbbe60485bada35126ad9b87d59 +Author: Nicholas Marriott +Date: Fri May 24 12:41:24 2024 +0000 +Forwarded: not-needed + + Do not escape $ unless DQ is set, that is the only case where we need to + escape it. + +Origin: upstream, https://github.com/tmux/tmux/commit/692ce59bcef5fcbbe60485bada35126ad9b87d59 + +diff --git a/utf8.c b/utf8.c +index 0abb787534..03ab7e9304 100644 +--- a/utf8.c ++++ b/utf8.c +@@ -517,7 +517,7 @@ utf8_strvis(char *dst, const char *src, size_t len, int flag) + /* Not a complete, valid UTF-8 character. */ + src -= ud.have; + } +- if (src[0] == '$' && src < end - 1) { ++ if ((flag & VIS_DQ) && src[0] == '$' && src < end - 1) { + if (isalpha((u_char)src[1]) || + src[1] == '_' || + src[1] == '{') -- cgit v1.2.3