From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 9 Jul 2022 15:47:33 +0000 (+0200)
Subject: Exclude platform specific browsers from custom type
X-Git-Tag: emacs-29.0.90~1447^2~1060
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=16e79eb75f0d55bc24442f0faf11cd0a4ca8f62c;p=emacs.git

Exclude platform specific browsers from custom type

* lisp/net/browse-url.el (browse-url--browser-defcustom-type):
Don't include platform specific browsers on other platforms.
---

diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index c5055ac4a52..8d103e251bf 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -148,14 +148,15 @@
   :group 'comm)
 
 (defvar browse-url--browser-defcustom-type
-  '(choice
-    (function-item :tag "eww" :value  eww-browse-url)
+  `(choice
+    (function-item :tag "Emacs Web Wowser (EWW)" :value  eww-browse-url)
     (function-item :tag "Mozilla" :value  browse-url-mozilla)
     (function-item :tag "Firefox" :value browse-url-firefox)
     (function-item :tag "Google Chrome" :value browse-url-chrome)
     (function-item :tag "Chromium" :value browse-url-chromium)
     (function-item :tag "GNOME Web (Epiphany)" :value  browse-url-epiphany)
-    (function-item :tag "WebPositive" :value browse-url-webpositive)
+    ,@(when (eq system-type 'haiku)
+        (list '(function-item :tag "WebPositive" :value browse-url-webpositive)))
     (function-item :tag "Text browser in an xterm window"
 		   :value browse-url-text-xterm)
     (function-item :tag "Text browser in an Emacs window"
@@ -163,11 +164,13 @@
     (function-item :tag "KDE" :value browse-url-kde)
     (function-item :tag "Elinks" :value browse-url-elinks)
     (function-item :tag "Specified by `Browse Url Generic Program'"
-		   :value browse-url-generic)
-    (function-item :tag "Default Windows browser"
-		   :value browse-url-default-windows-browser)
-    (function-item :tag "Default macOS browser"
-		   :value browse-url-default-macosx-browser)
+                   :value browse-url-generic)
+    ,@(when (eq system-type 'windows-nt)
+        (list '(function-item :tag "Default Windows browser"
+                              :value browse-url-default-windows-browser)))
+    ,@(when (eq system-type 'darwin)
+        (list '(function-item :tag "Default macOS browser"
+                              :value browse-url-default-macosx-browser)))
     (function-item :tag "Default browser"
 		   :value browse-url-default-browser)
     (function :tag "Your own function")