mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 05:30:43 -08:00
Code Issues Projects Releases Wiki Activity

Further fixups of the variable-pitch eww header line change

Browse source 
* lisp/net/eww.el (eww-update-header-line-format): Protect against
:url not being set.
This commit is contained in:
Lars Ingebrigtsen 2020-09-13 18:51:44 +02:00
parent 2c62e9b20d
commit f9aa499afa
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/net/eww.el
View file

@ -730,8 +730,7 @@ Currently this means either text/html or application/xhtml+xml."
(setq header-line-format
(and eww-header-line-format
(let ((peer (plist-get eww-data :peer))
(url (propertize (plist-get eww-data :url)
'face 'variable-pitch))
(url (plist-get eww-data :url))
(title (propertize
(if (zerop (length (plist-get eww-data :title)))
"[untitled]"
@ -747,10 +746,13 @@ Currently this means either text/html or application/xhtml+xml."
;; Limit the length of the title so that the host name
;; of the URL is always visible.
(when url
(setq url (propertize url 'face 'variable-pitch))
(let* ((parsed (url-generic-parse-url url))
(host-length (shr-string-pixel-width
(format "%s://%s" (url-type parsed)
(url-host parsed))))
(propertize
(format "%s://%s" (url-type parsed)
(url-host parsed))
'face 'variable-pitch)))
(width (window-width nil t)))
(cond
;; The host bit is wider than the window, so nix