Update webjump.el example links

* lisp/net/webjump.el (webjump-sample-sites): Don't recommend some
defunct or otherwise non-privacy respecting websites.  Prefer HTTPS to
HTTP.
(webjump-to-iwin, webjump-state-to-postal-alist): Make obsolete, as this
functionality seems to no longer work due to broken links.

(cherry picked from commit 34d353cd7207fc47e7c2945faad4ca6e4b864a0f)

diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index 020e574d4f466322831e83ebf6314f246d148c53..4afd9b292c547317d6a73f79dda70088e7ec0076 100644 (file)
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -94,53 +94,34 @@ external browser like IceCat."
      ;; GNU FTP Mirror List from https://www.gnu.org/order/ftp.html
      [mirrors "https://ftp.gnu.org/pub/gnu/"
               "https://ftpmirror.gnu.org"])
-    ("GNU Project Website" . "www.gnu.org")
+    ("GNU Project Website" . "https://www.gnu.org")
 
     ;; Emacs.
     ("Emacs Website" .
-     "www.gnu.org/software/emacs/emacs.html")
+     "https://www.gnu.org/software/emacs/emacs.html")
     ("Savannah Emacs page" .
-     "savannah.gnu.org/projects/emacs")
-    ("Emacs Lisp List" .
-     "www.damtp.cam.ac.uk/user/eglen/emacs/ell.html")
+     "https://savannah.gnu.org/projects/emacs")
     ("Emacs Wiki" .
-     [simple-query "www.emacswiki.org"
-                  "www.emacswiki.org/cgi-bin/wiki/" ""])
+     [simple-query "https://www.emacswiki.org"
+                  "https://www.emacswiki.org/cgi-bin/wiki/" ""])
 
     ;; Internet search engines.
     ("DuckDuckGo" .
-     [simple-query "duckduckgo.com"
-                  "duckduckgo.com/?q=" ""])
-    ("Google Groups" .
-     [simple-query "groups.google.com"
-                  "groups.google.com/groups?q=" ""])
-    ("Yahoo" .
-     [simple-query "www.yahoo.com" "search.yahoo.com/search?p=" ""])
-    ("Yahoo: Reference" . "www.yahoo.com/Reference/")
+     [simple-query "https://duckduckgo.com"
+                  "https://duckduckgo.com/?q=" ""])
     ("Wikipedia" .
-     [simple-query "wikipedia.org" "wikipedia.org/wiki/" ""])
-
-    ;; Misc. general interest.
-    ("National Weather Service" . webjump-to-iwin)
-    ("Usenet FAQs" .
-     "http://www.faqs.org/faqs/")
-    ("RTFM Usenet FAQs by Group" .
-     "ftp://rtfm.mit.edu/pub/usenet-by-group/")
-    ("RTFM Usenet FAQs by Hierarchy" .
-     "ftp://rtfm.mit.edu/pub/usenet-by-hierarchy/")
-    ("X Consortium Archive" . "ftp.x.org")
+     [simple-query "https://wikipedia.org" "https://wikipedia.org/wiki/" ""])
 
     ;; Computer social issues, privacy, professionalism.
-    ("Association for Computing Machinery" . "www.acm.org")
+    ("Association for Computing Machinery" . "https://www.acm.org")
     ("Computer Professionals for Social Responsibility" . "http://www.cpsr.org")
-    ("Electronic Frontier Foundation" . "www.eff.org")
-    ("IEEE Computer Society" . "www.computer.org")
+    ("Electronic Frontier Foundation" . "https://www.eff.org")
+    ("IEEE Computer Society" . "https://www.computer.org")
     ("Risks Digest" . webjump-to-risks)
 
     ;; More.
     ("Supplemental Web site list for webjump" .
-     "www.neilvandyke.org/webjump/")
-
+     "https://www.neilvandyke.org/webjump/")
     )
   "Sample hotlist for WebJump.
 See the documentation for `webjump' and `webjump-sites'.")
@@ -162,6 +143,7 @@ See the documentation for `webjump' and `webjump-sites'.")
     ("Utah" . "ut") ("Vermont" . "vt") ("Virginia" . "va")
     ("Washington" . "wa") ("West Virginia" . "wv") ("Wisconsin" . "wi")
     ("Wyoming" . "wy")))
+(make-obsolete-variable 'webjump-state-to-postal-alist nil "31.1")
 
 ;;------------------------------------------------------------ Option Variables
 
@@ -210,6 +192,7 @@ submitting the URL."
 ;;------------------------------------------------------- Sample Site Functions
 
 (defun webjump-to-iwin (name)
+  (declare (obsolete nil "31.1"))
   (let* ((prefix "http://www.nws.noaa.gov/view/")
          (state (webjump-read-choice name "state"
                                      (append '(("Puerto Rico" . "pr")