Mark bookmarks to EWW

When a file has a bookmark, generating a link in that file (e.g. to the
line at point) results in a query from Org which link generating
function to use.  This is annoying and interferes with the usual flow.
To remedy this, we simply try not to be too smart and just generate
links to bookmarks when in the bookmark menu.

site-lisp/db-org.el

@@ -2235,39 +2235,12 @@ PARAMS may contain the following values:
   (bookmark-jump bookmark))
 
 (defun db/org-bookmark-store-link ()
-  "Store a link to the bookmark at point.
+  "Store a link to the bookmark at point."
-
+  (let (bookmark)
-When in Dired, try to find bookmark that points to the file at
+    (when (eq major-mode 'bookmark-bmenu-mode)
-point.  When in a buffer associated with a file, try to find a
+      (setq bookmark (bookmark-bmenu-bookmark))
-bookmark that points to this file.  Note that in this case, for
+      (org-link-store-props :link (concat "bookmark:" bookmark)
-performance reasons, equality checks between file names is not
+			    :description bookmark))))
-done with `file-equal-p', which seems to be too slow on Windows;
-a simple `string=' is used instead, which may not be completely
-accurate in certain cases."
-  (let (file bookmark bmks)
-    (cond ((eq major-mode 'dired-mode)
-	   (setq file (abbreviate-file-name (dired-get-filename))))
-	  ((buffer-file-name (buffer-base-buffer))
-	   (setq file (abbreviate-file-name
-		       (buffer-file-name (buffer-base-buffer))))))
-    (if (not file)
-	(when (eq major-mode 'bookmark-bmenu-mode)
-	  (setq bookmark (bookmark-bmenu-bookmark)))
-      (when (setq bmks
-		  (->> (bookmark-all-names)
-                       (-map (lambda (name)
-                               (if (string= file
-                                            (abbreviate-file-name
-                                             (bookmark-location name)))
-                                   name)))
-                       (delete nil)))
-	(setq bookmark
-	      (if (eq 1 (length bmks))
-		  (car bmks)
-		(completing-read "Bookmark: " bmks nil t nil nil (car bmks))))))
-    (if bookmark
-	(org-link-store-props :link (concat "bookmark:" bookmark)
-			      :description bookmark))))
 
 
 ;;; End

site-lisp/db-utils.el

@@ -865,6 +865,8 @@ it."
   "Extract filename from bookmark BMK and apply `eww' to it."
   (eww (bookmark-get-filename bmk)))
 
+(put 'db/bookmark-eww 'bookmark-handler-type "EWW")
+
 (defun db/bookmark-add-external (location name)
   "Add NAME as bookmark to LOCATION that is opened by the operating system.
 Offers simple completing from the list of recently opened files.