summaryrefslogtreecommitdiffstats
path: root/debian/patches/upstream-692ce59bce.diff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-11 16:45:35 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-11 16:45:35 +0000
commita6908f6efbc934af797ed6f16f45b2c750da1832 (patch)
tree0a8d933eea0b92f7812b47e10b0bbaecfc46bed4 /debian/patches/upstream-692ce59bce.diff
parentAdding debian version 3.4-5. (diff)
downloadtmux-d171bfccebf1a855ebb0e1101c4271adb880aa37.tar.xz
tmux-d171bfccebf1a855ebb0e1101c4271adb880aa37.zip
Adding debian version 3.4-6.debian/3.4-6
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/upstream-692ce59bce.diff')
-rw-r--r--debian/patches/upstream-692ce59bce.diff23
1 files changed, 23 insertions, 0 deletions
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 <nicholas.marriott@gmail.com>
+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] == '{')