From 6ebbe5a4507d906e78a71314256f0abe735ca88f Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Tue, 21 Apr 2020 07:24:20 +0200 Subject: [PATCH] fish_clipboard_copy: Stop adding newlines When this switched over from directly piping commandline to storing its output and using printf, I inadvertently always added a trailing newline. That's probably annoying. Note that this will now always *remove* a trailing newline (because the command substitution does). That will barely make a difference (because trailing newlines are quite unusual in the commandline) and will probably feel better than keeping it - we could even make a point of removing trailing whitespace in general. Fixes #6927 --- share/functions/fish_clipboard_copy.fish | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/functions/fish_clipboard_copy.fish b/share/functions/fish_clipboard_copy.fish index 47fa8264a..6bb60a473 100644 --- a/share/functions/fish_clipboard_copy.fish +++ b/share/functions/fish_clipboard_copy.fish @@ -3,14 +3,14 @@ function fish_clipboard_copy set -l cmdline (commandline --current-selection) test -n "$cmdline"; or set cmdline (commandline) if type -q pbcopy - printf '%s\n' $cmdline | pbcopy + printf '%s' $cmdline | pbcopy else if set -q WAYLAND_DISPLAY; and type -q wl-copy - printf '%s\n' $cmdline | wl-copy + printf '%s' $cmdline | wl-copy else if type -q xsel # Silence error so no error message shows up # if e.g. X isn't running. - printf '%s\n' $cmdline | xsel --clipboard 2>/dev/null + printf '%s' $cmdline | xsel --clipboard 2>/dev/null else if type -q xclip - printf '%s\n' $cmdline | xclip -selection clipboard 2>/dev/null + printf '%s' $cmdline | xclip -selection clipboard 2>/dev/null end end