Record the right URL in eww

* net/eww.el (eww): Record the new URL immediately, so that if the
HTTP fetch fails, we have the right URL in the buffer.

2 files changed, 6 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85748e60208..b0b1d747746 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-11-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * net/eww.el (eww): Record the new URL immediately, so that if the
+        HTTP fetch fails, we have the right URL in the buffer.
+
         * dom.el (dom-pp): New function.
 
 2014-11-17  Eli Zaretskii  <eliz@gnu.org>
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 10298b109d1..a8c910945b6 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -255,6 +255,7 @@ word(s) will be searched for via `eww-search-prefix'."
                              (replace-regexp-in-string " " "+" url))))))
   (unless (eq major-mode 'eww-mode)
     (eww-setup-buffer)
+    (plist-put eww-data :url url)
     (eww-update-header-line-format)
     (let ((inhibit-read-only t))
       (insert (format "Loading %s..." url))))
@@ -503,11 +504,8 @@ See the `eww-search-prefix' variable for the search engine used."
       (doc-view-mode)))
   (goto-char (point-min)))
 
-(defun eww-setup-buffer (&optional buffer)
-  (switch-to-buffer
-   (if (buffer-live-p buffer)
-       buffer
-     (get-buffer-create "*eww*")))
+(defun eww-setup-buffer ()
+  (switch-to-buffer (get-buffer-create "*eww*"))
   (let ((inhibit-read-only t))
     (remove-overlays)
     (erase-buffer))