bug#41159: [PATCH] Mark browse-url-conkeror as obsolete

[Stefan Kangas <stefankangas@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 687 bytes --]

Severity: minor

The Conkeror website says:

    "Conkeror was originally written for Xulrunner, which was deprecated
    by Mozilla a couple of years ago ... [Firefox 52 ESR] reached end of
    life on September 5 2018, to be replaced by a Quantum-based release.
    That means there will be no more officially supported browser from
    Mozilla on which to run Conkeror.  As modern web browsers have a
    large attack surface, this is bad if you have any concerns about
    security.  Here are some possible alternatives."
    From: http://conkeror.org/Alternatives

I think it's time to mark browse-url-conkeror obsolete.

Please see the attached patch.

Best regards,
Stefan Kangas

[-- Attachment #2: 0001-Mark-browse-url-conkeror-as-obsolete.patch --]
[-- Type: text/x-diff, Size: 4191 bytes --]

From cbab17dc6fdb42098cef24e30353a938c31b3e65 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Sat, 9 May 2020 19:59:42 +0200
Subject: [PATCH] Mark browse-url-conkeror as obsolete

The Conkeror website says "there will be no more officially
supported browser from Mozilla on which to run Conkeror" after
Firefox 52 ESR reaches end of life September 5, 2018.
Ref: http://conkeror.org/Alternatives

* lisp/net/browse-url.el:
(browse-url--browser-defcustom-type)
(browse-url-conkeror-new-window-is-buffer)
(browse-url-conkeror-program, browse-url-conkeror-arguments)
(browse-url-default-browser, browse-url-conkeror): Mark the
conkeror browser as obsolete.

* etc/NEWS: Mention this.
---
 etc/NEWS               |  2 ++
 lisp/net/browse-url.el | 11 ++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index ae676a9bf8..4e6f6af4fd 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -348,6 +348,8 @@ symbol property to the browsing functions.  With a new command
 'browse-url-with-browser-kind', an URL can explicitly be browsed with
 either an internal or external browser.
 
+*** Support for the conkeror browser is now obsolete.
+
 \f
 * New Modes and Packages in Emacs 28.1
 
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index f88de98fca..42f7243fbf 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -39,7 +39,6 @@
 ;; browse-url-chrome                  Chrome      47.0.2526.111
 ;; browse-url-chromium                Chromium    3.0
 ;; browse-url-epiphany                Epiphany    Don't know
-;; browse-url-conkeror                Conkeror    Don't know
 ;; browse-url-w3                      w3          0
 ;; browse-url-text-*	              Any text browser     0
 ;; browse-url-generic                 arbitrary
@@ -152,7 +151,6 @@ browse-url--browser-defcustom-type
     (function-item :tag "Google Chrome" :value browse-url-chrome)
     (function-item :tag "Chromium" :value browse-url-chromium)
     (function-item :tag "Epiphany" :value  browse-url-epiphany)
-    (function-item :tag "Conkeror" :value  browse-url-conkeror)
     (function-item :tag "Text browser in an xterm window"
 		   :value browse-url-text-xterm)
     (function-item :tag "Text browser in an Emacs window"
@@ -394,6 +392,8 @@ browse-url-conkeror-new-window-is-buffer
   :version "25.1"
   :type 'boolean)
 
+(make-obsolete-variable 'browse-url-conkeror-new-window-is-buffer nil "28.1")
+
 (defcustom browse-url-galeon-new-window-is-tab nil
   "Whether to open up new windows in a tab or a new window.
 If non-nil, then open the URL in a new tab rather than a new window if
@@ -447,11 +447,15 @@ browse-url-conkeror-program
   :type 'string
   :version "25.1")
 
+(make-obsolete-variable 'browse-url-conkeror-program nil "28.1")
+
 (defcustom browse-url-conkeror-arguments nil
   "A list of strings to pass to Conkeror as arguments."
   :version "25.1"
   :type '(repeat (string :tag "Argument")))
 
+(make-obsolete-variable 'browse-url-conkeror-arguments nil "28.1")
+
 (defcustom browse-url-filename-alist
   `(("^/\\(ftp@\\|anonymous@\\)?\\([^:/]+\\):/*" . "ftp://\\2/")
     ;; The above loses the username to avoid the browser prompting for
@@ -1070,7 +1074,7 @@ browse-url-default-browser
     ((executable-find browse-url-kde-program) 'browse-url-kde)
 ;;;    ((executable-find browse-url-netscape-program) 'browse-url-netscape)
 ;;;    ((executable-find browse-url-mosaic-program) 'browse-url-mosaic)
-    ((executable-find browse-url-conkeror-program) 'browse-url-conkeror)
+;;;    ((executable-find browse-url-conkeror-program) 'browse-url-conkeror)
     ((executable-find browse-url-chrome-program) 'browse-url-chrome)
     ((executable-find browse-url-xterm-program) 'browse-url-text-xterm)
     ((locate-library "w3") 'browse-url-w3)
@@ -1544,6 +1548,7 @@ browse-url-conkeror
 
 When called non-interactively, use optional second argument
 NEW-WINDOW instead of `browse-url-new-window-flag'."
+  (declare (obsolete nil "28.1"))
   (interactive (browse-url-interactive-arg "URL: "))
   (setq url (browse-url-encode-url url))
   (let* ((process-environment (browse-url-process-environment)))
-- 
2.26.2