Commit 62ad85e6 authored by Glenn Morris's avatar Glenn Morris
Browse files

* 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
parent 0fb17a18
2013-10-16 Glenn Morris <rgm@gnu.org>
* 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 <eliz@gnu.org>
* menu-bar.el (tty-menu-navigation-map): Bind mouse wheels to TTY
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment