mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Add 'eww-readable-urls'

Browse source 
* lisp/net/eww.el (eww-readable-urls): New option.
(eww-default-readable-p): New function...
(eww-display-html): ... use it.

* test/lisp/net/eww-tests.el (eww-test/readable/default-readable): New
test.

* doc/misc/eww.texi (Basics): Document 'eww-readable-urls'.

* etc/NEWS: Announce this change (bug#68254).
This commit is contained in:
Jim Porter 2024-03-18 16:52:34 -07:00
parent 72972118e6
commit 4b0f5cdb01
4 changed files with 72 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

43
lisp/net/eww.el
View file

@ -275,6 +275,22 @@ parameter, and should return the (possibly) transformed URL."
:type '(repeat function)
:version "29.1")
(defcustom eww-readable-urls nil
"A list of regexps matching URLs to display in readable mode by default.
EWW will display matching URLs using `eww-readable' (which see).
Each element can be one of the following forms: a regular expression in
string form or a cons cell of the form (REGEXP . READABILITY). If
READABILITY is non-nil, this behaves the same as the string form;
otherwise, URLs matching REGEXP will never be displayed in readable mode
by default."
:type '(repeat (choice (string :tag "Readable URL")
(cons :tag "URL and Readability"
(string :tag "URL")
(radio (const :tag "Readable" t)
(const :tag "Non-readable" nil)))))
:version "30.1")
(defcustom eww-readable-adds-to-history t
"If non-nil, calling `eww-readable' adds a new entry to the history."
:type 'boolean
@ -809,11 +825,15 @@ This replaces the region with the preprocessed HTML."
(let ((source (buffer-substring (point) (point-max))))
(with-current-buffer buffer
(plist-put eww-data :source source)))
(eww-display-document
(or document
(eww-document-base
url (eww--parse-html-region (point) (point-max) charset)))
point buffer))
(unless document
(let ((dom (eww--parse-html-region (point) (point-max) charset)))
(when (eww-default-readable-p url)
(eww-score-readability dom)
(setq dom (eww-highest-readability dom))
(with-current-buffer buffer
(plist-put eww-data :readable t)))
(setq document (eww-document-base url dom))))
(eww-display-document document point buffer))
(defun eww-handle-link (dom)
(let* ((rel (dom-attr dom 'rel))
@ -1159,6 +1179,19 @@ adds a new entry to `eww-history'."
(setq result highest))))
result))
(defun eww-default-readable-p (url)
"Return non-nil if URL should be displayed in readable mode by default.
This consults the entries in `eww-readable-urls' (which see)."
(catch 'found
(let (result)
(dolist (regexp eww-readable-urls)
(if (consp regexp)
(setq result (cdr regexp)
regexp (car regexp))
(setq result t))
(when (string-match regexp url)
(throw 'found result))))))
(defvar-keymap eww-mode-map
"g" #'eww-reload ;FIXME: revert-buffer-function instead!
"G" #'eww