Il giorno mer 5 ago 2020 alle ore 23:16 Eric Sunshine
<sunshine@xxxxxxxxxxxxxx> ha scritto:
>
> On Wed, Aug 5, 2020 at 4:02 PM Marco Trevisan (Treviño) via
> GitGitGadget <gitgitgadget@xxxxxxxxx> wrote:
> > mergetool-lib: give kdiff3 prioirty in KDE environments
>
> s/prioirty/priority/
>
> > Signed-off-by: Marco Trevisan (Treviño) <mail@xxxxxxxxx>
> > ---
> > diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> > @@ -288,12 +288,15 @@ list_merge_tool_candidates () {
> > - cross_desktop_tools="opendiff kdiff3 tkdiff xxdiff"
> > + cross_desktop_tools="opendiff tkdiff xxdiff"
> > if is_desktop "GNOME"
> > then
> > - tools="meld $cross_desktop_tools $tools"
> > + tools="meld $cross_desktop_tools kdiff3 $tools"
> > + elif is_desktop "KDE"
> > + then
> > + tools="kdiff3 $cross_desktop_tools meld $tools"
> > else
> > - tools="$cross_desktop_tools meld $tools"
> > + tools="$cross_desktop_tools kdiff3 meld $tools"
> > fi
>
> Wouldn't this change the behavior for people running old KDE which
> doesn't have XDG_CURRENT_DESKTOP, giving "kdiff3" much lower priority
> than it had before?
Yeah, true.. So to avoid this we can just also check for
KDE_FULL_SESSION, that has been introduced by KDE 3.2, and this should
be enough I think.
> This change also illustrates why I wasn't convinced that patch 2/3 was
> necessarily a good idea. When you touch 'cross_desktop_tools' here,
> you end up having to touch all the other 'tools=' lines anyhow, so the
> introduction of 'cross_desktop_tools' didn't buy much in terms of
> reduced maintenance cost.
Yeah, I had the same feeling, TBH.
--
Treviño's World - Life and Linux
http://www.3v1n0.net
