From 5ee8080ca7bb5e77a9eb03a6c12c59cf5bf041a8 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 13 Apr 2021 22:38:17 -0400 Subject: [PATCH] Respect dash-docs-browser-func Formerly, `+lookup/in-docsets` would disregard dash-docs-browser-func (locally setting it to the value of `+lookup-open-url-fn`). Now only `+lookup/online` respects +lookup-open-url-fn and `+lookup/in-docsets` respects `dash-docs-brwoser-func`. Closes #4795 --- modules/tools/lookup/README.org | 20 ++++++++++++++------ modules/tools/lookup/autoload/docsets.el | 1 - 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/tools/lookup/README.org b/modules/tools/lookup/README.org index 06969bc4c..7800e7101 100644 --- a/modules/tools/lookup/README.org +++ b/modules/tools/lookup/README.org @@ -208,21 +208,29 @@ This determines what docsets to implicitly search for when you use docsets must be installed with ~dash-docset-install-docset~. ** Open in eww instead of browser -To open results from ~+lookup/online~ or ~+lookup/in-docsets~ in EWW instead -of your system browser, change ~+lookup-open-url-fn~ (default: -~#'browse-url~): +~+lookup/online~ opens the search results with in ~+lookup-open-url-fn~ +(default: ~#'browse-url~). Here is how to change this to EWW (so it opens inside +Emacs): #+BEGIN_SRC emacs-lisp (setq +lookup-open-url-fn #'eww) #+END_SRC +#+begin_quote +~+lookup/in-docsets~ consults ~dash-docs-browser-func~ instead, which is already +set to ~#'eww~ by default. +#+end_quote + ** Open in Xwidget WebKit instead of browser -To open results from ~+lookup/online~ or ~+lookup/in-docsets~ in Xwidget -WebKit instead of your system browser, set ~+lookup-open-url-fn~ to -~+lookup-xwidget-webkit-open-url-fn~ (needs Emacs with Xwidgets support): +To open results from ~+lookup/online~ or ~+lookup/in-docsets~ in Xwidget WebKit +instead of your system browser, set ~+lookup-open-url-fn~ and/or +~dash-docs-browser-func~ to ~+lookup-xwidget-webkit-open-url-fn~ (needs Emacs +with Xwidgets support): #+BEGIN_SRC emacs-lisp (setq +lookup-open-url-fn #'+lookup-xwidget-webkit-open-url-fn) +(after! dash-docs + (setq dash-docs-browser-func #'+lookup-xwidget-webkit-open-url-fn)) #+END_SRC * Appendix diff --git a/modules/tools/lookup/autoload/docsets.el b/modules/tools/lookup/autoload/docsets.el index 041eb84b0..fffbe58a5 100644 --- a/modules/tools/lookup/autoload/docsets.el +++ b/modules/tools/lookup/autoload/docsets.el @@ -86,7 +86,6 @@ installed with `dash-docs-install-docset'." (interactive "P") (require 'dash-docs) (let ((dash-docs-common-docsets) - (dash-docs-browser-func +lookup-open-url-fn) (dash-docs-docsets (if arg (dash-docs-installed-docsets)