diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-11 16:45:35 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-11 16:45:35 +0000 |
| commit | 091a6d59fa6d304c4e5c50db4b4f8a8f6ef8b19c (patch) | |
| tree | 618d1593a7dbb2bab7ee8e3b9d5d98f5d4cc39eb /debian/patches/upstream-692ce59bce.diff | |
| parent | Releasing progress-linux version 3.4-5~progress7.99u1. (diff) | |
| download | tmux-091a6d59fa6d304c4e5c50db4b4f8a8f6ef8b19c.tar.xz tmux-091a6d59fa6d304c4e5c50db4b4f8a8f6ef8b19c.zip | |
Merging debian version 3.4-6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/upstream-692ce59bce.diff | 23 |
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] == '{') |