procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only do multi-isearch in eww if there's next/prev links

Browse source 
* lisp/net/eww.el (eww-handle-link): Only do multi-isearch if
there's a next/prev link in the HTML (bug#50497).
(eww-setup-buffer): Clear the function.
(eww-mode): Don't set it here.
This commit is contained in:
Lars Ingebrigtsen 2021-09-13 10:03:24 +02:00
parent bb446c1d96
commit 4ee8b4d225
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/net/eww.el
View file

@ -668,9 +668,12 @@ Currently this means either text/html or application/xhtml+xml."
("home" . :home)
("contents" . :contents)
("up" . :up)))))
(and href
where
(plist-put eww-data (cdr where) href))))
(when (and href where)
(when (memq (cdr where) '(:next :previous))
;; Multi-page isearch support.
(setq-local multi-isearch-next-buffer-function
#'eww-isearch-next-buffer))
(plist-put eww-data (cdr where) href))))
(defvar eww-redirect-level 1)
@ -840,6 +843,8 @@ Currently this means either text/html or application/xhtml+xml."
(remove-overlays)
(erase-buffer))
(setq bidi-paragraph-direction nil)
;; May be set later if there's a next/prev link.
(setq-local multi-isearch-next-buffer-function nil)
(unless (eq major-mode 'eww-mode)
(eww-mode)))
@ -1080,8 +1085,6 @@ the like."
(setq-local tool-bar-map eww-tool-bar-map))
;; desktop support
(setq-local desktop-save-buffer #'eww-desktop-misc-data)
;; multi-page isearch support
(setq-local multi-isearch-next-buffer-function #'eww-isearch-next-buffer)
(setq truncate-lines t)
(setq-local thing-at-point-provider-alist
(append thing-at-point-provider-alist