diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2020-09-13 18:51:44 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-09-13 18:51:51 +0200 |
| commit | f9aa499afa2f65952b5ec7905bf836f6a2ccbfd4 (patch) | |
| tree | 0b091e0a5f3f68ad02c1f72799cdb70763502ccf /lisp | |
| parent | 2c62e9b20dcf615a283e8fce2b7b74981b15ae67 (diff) | |
| download | emacs-f9aa499afa2f65952b5ec7905bf836f6a2ccbfd4.tar.gz | |
Further fixups of the variable-pitch eww header line change
* lisp/net/eww.el (eww-update-header-line-format): Protect against
:url not being set.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/eww.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 69dc2d47d67..2717dfbe79d 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -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 |