el/dot-emacs.el: Freshen the W3M search engine list.

And use DuckDuckGo by default.

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index f0d41c3daf5a743b130552243a531ff0184af5d7..1a48d0851cc7e97ab1dca34a2bb0896158a0d1e7 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1438,31 +1438,28 @@ (eval-after-load "w3m-search"
   '(progn
      (dolist
         (item
-         '(("g" "Google" "http://www.google.co.uk/search?q=%s")
+         '(("ddg" "DuckDuckGo" "https://duckduckgo.com/?q=%s")
+           ("sp" "StartPage" "https://www.startpage.com/do/search?query=%s")
+           ("wp" "Wikipedia"
+            "https://en.wikipedia.org/wiki/Special:Search?go=Go&search=%s")
+           ("g" "Google" "https://www.google.co.uk/search?q=%s")
+           ("gi" "Images" "https://images.google.com/images?q=%s")
            ("gd" "Google Directory"
-            "http://www.google.com/search?cat=gwd/Top&q=%s")
-           ("gg" "Google Groups" "http://groups.google.com/groups?q=%s")
+            "https://www.google.com/search?cat=gwd/Top&q=%s")
+           ("gg" "Google Groups" "https://groups.google.com/groups?q=%s")
+           ("gm" "Google maps" "https://maps.google.co.uk/maps?q=%s&hl=en")
            ("ward" "Ward's wiki" "http://c2.com/cgi/wiki?%s")
-           ("gi" "Images" "http://images.google.com/images?q=%s")
-           ("rfc" "RFC"
-            "http://metalzone.distorted.org.uk/ftp/pub/mirrors/rfc/rfc%s.txt.gz")
-           ("wp" "Wikipedia"
-            "http://en.wikipedia.org/wiki/Special:Search?go=Go&search=%s")
-           ("imdb" "IMDb" "http://www.imdb.com/Find?%s")
-           ("nc-wiki" "nCipher wiki"
-            "http://wiki.ncipher.com/wiki/bin/view/Devel/?topic=%s")
-           ("map" "Google maps" "http://maps.google.co.uk/maps?q=%s&hl=en")
+           ("imdb" "IMDb" "https://www.imdb.com/Find?%s")
            ("lp" "Launchpad bug by number"
             "https://bugs.launchpad.net/bugs/%s")
            ("lppkg" "Launchpad bugs by package"
             "https://bugs.launchpad.net/%s")
            ("msdn" "MSDN"
-            "http://social.msdn.microsoft.com/Search/en-GB/?query=%s&ac=8")
+            "https://social.msdn.microsoft.com/Search/en-GB/?query=%s&ac=8")
            ("debbug" "Debian bug by number"
-            "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s")
+            "https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s")
            ("debbugpkg" "Debian bugs by package"
-            "http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=%s")
-           ("ljlogin" "LJ login" "http://www.livejournal.com/login.bml")))
+            "https://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=%s")))
        (add-to-list 'w3m-search-engine-alist
                    (list (cadr item) (cl-caddr item) nil))
        (add-to-list 'w3m-uri-replace-alist
@@ -1470,6 +1467,8 @@ (eval-after-load "w3m-search"
                          'w3m-search-uri-replace
                          (cadr item))))))
 
+(setq w3m-search-default-engine "DuckDuckGo")
+
 ;;;--------------------------------------------------------------------------
 ;;; Paragraph filling.