[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114677: * net/eww.el (eww-render): Always set eww-c
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114677: * net/eww.el (eww-render): Always set eww-current-url, and update header line. |
Date: |
Wed, 16 Oct 2013 01:31:00 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114677
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15622
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-10-15 18:30:55 -0700
message:
* net/eww.el (eww-render): Always set eww-current-url, and update header
line.
(eww-display-html): ... Rather than just doing it here.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/eww.el eww.el-20130610114603-80ap3gwnw4x4m5ix-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-10-15 18:40:22 +0000
+++ b/lisp/ChangeLog 2013-10-16 01:30:55 +0000
@@ -1,3 +1,9 @@
+2013-10-16 Glenn Morris <address@hidden>
+
+ * 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 <address@hidden>
* menu-bar.el (tty-menu-navigation-map): Bind mouse wheels to TTY
=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el 2013-09-18 04:48:55 +0000
+++ b/lisp/net/eww.el 2013-10-16 01:30:55 +0000
@@ -160,7 +160,9 @@
(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 @@
'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 @@
(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 @@
"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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114677: * net/eww.el (eww-render): Always set eww-current-url, and update header line.,
Glenn Morris <=