From f36c82ce86bfcef416a88e985ae7f38e5bd41f50 Mon Sep 17 00:00:00 2001 From: David Adam Date: Fri, 1 May 2020 21:28:35 +0800 Subject: [PATCH] Reenable command descriptions on macOS 10.15.4+ Further work on #6270, as recommended in 611a6589ea56d66c1. [ci skip] --- share/functions/__fish_complete_man.fish | 5 ++--- share/functions/__fish_describe_command.fish | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/share/functions/__fish_complete_man.fish b/share/functions/__fish_complete_man.fish index 3654ef303..318e9a211 100644 --- a/share/functions/__fish_complete_man.fish +++ b/share/functions/__fish_complete_man.fish @@ -6,9 +6,8 @@ # `apropos` with their own, which presumably doesn't have the same problem. if test (uname) = Darwin set -l darwin_version (uname -r | string split .) - # macOS 15 is Darwin 19, this is an issue at least up to 10.15.3. - # If this is fixed in later versions uncomment the second check. - if test "$darwin_version[1]" = 19 # -a "$darwin_version[2]" -le 3 + # macOS 15 is Darwin 19, this is an issue up to and including 10.15.3. + if test "$darwin_version[1]" = 19 -a "$darwin_version[2]" -le 3 set -l apropos (command -s apropos) if test "$apropos" = /usr/bin/apropos function __fish_complete_man diff --git a/share/functions/__fish_describe_command.fish b/share/functions/__fish_describe_command.fish index a200b6cd8..c8baea981 100644 --- a/share/functions/__fish_describe_command.fish +++ b/share/functions/__fish_describe_command.fish @@ -9,9 +9,8 @@ # So we disable this entirely in that case. if test (uname) = Darwin set -l darwin_version (uname -r | string split .) - # macOS 15 is Darwin 19, this is an issue at least up to 10.15.3. - # If this is fixed in later versions uncomment the second check. - if test "$darwin_version[1]" = 19 # -a "$darwin_version[2]" -le 3 + # macOS 15 is Darwin 19, this is an issue up to and including 10.15.3. + if test "$darwin_version[1]" = 19 -a "$darwin_version[2]" -le 3 function __fish_describe_command end # (remember: exit when `source`ing only exits the file, not the shell)