From 62ad85e6af83a70576642219bef4d147410d2f73 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 15 Oct 2013 18:30:55 -0700 Subject: [PATCH] * net/eww.el (eww-render): Always set eww-current-url, and update header line. (eww-display-html): ... Rather than just doing it here. Fixes: debbugs:15622 --- lisp/ChangeLog | 6 ++++++ lisp/net/eww.el | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ec92c2b5c29..50ef17cfef1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-10-16 Glenn Morris + + * net/eww.el (eww-render): Always set eww-current-url, + and update header line. (Bug#15622) + (eww-display-html): ... Rather than just doing it here. + 2013-10-15 Eli Zaretskii * menu-bar.el (tty-menu-navigation-map): Bind mouse wheels to TTY diff --git a/lisp/net/eww.el b/lisp/net/eww.el index e67d9c5a25c..573715e8fcf 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -160,7 +160,9 @@ word(s) will be searched for via `eww-search-prefix'." (eww-display-image)) (t (eww-display-raw))) - (setq eww-history-position 0) + (setq eww-current-url url + eww-history-position 0) + (eww-update-header-line-format) (cond (point (goto-char point)) @@ -212,8 +214,6 @@ word(s) will be searched for via `eww-search-prefix'." 'base (list (cons 'href url)) (libxml-parse-html-region (point) (point-max))))) (eww-setup-buffer) - (setq eww-current-url url) - (eww-update-header-line-format) (let ((inhibit-read-only t) (after-change-functions nil) (shr-width nil) @@ -266,6 +266,8 @@ word(s) will be searched for via `eww-search-prefix'." (setq header-line-format (replace-regexp-in-string "%" "%%" + ;; FIXME? Title can be blank. Default to, eg, last component + ;; of url? (format-spec eww-header-line-format `((?u . ,eww-current-url) (?t . ,eww-current-title))))) @@ -369,6 +371,7 @@ word(s) will be searched for via `eww-search-prefix'." "Mode for browsing the web. \\{eww-mode-map}" + ;; FIXME? This seems a strange default. (set (make-local-variable 'eww-current-url) 'author) (set (make-local-variable 'browse-url-browser-function) 'eww-browse-url) (set (make-local-variable 'after-change-functions) 'eww-process-text-input) -- 2.11.4.GIT