From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 25 Jun 2013 22:29:01 +0000 (+0200)
Subject: (eww-render): Move the history reset to the correct buffer.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1992^2~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=26bf2b82d8a028a42cf8ad8f0aa284561c4cde7f;p=emacs.git

(eww-render): Move the history reset to the correct buffer.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10b5daaac04..493052d4dcb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
 	* net/eww.el: Rework history traversal.  When going forward/back,
 	put these actions into the history, too, so that they can be
 	replayed.
+	(eww-render): Move the history reset to the correct buffer.
 
 2013-06-25  Juri Linkov  <juri@jurta.org>
 
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index eaff1a1b985..61bb4235c34 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -118,7 +118,6 @@ word(s) will be searched for via `eww-search-prefix'."
     (unless (string-match-p "\\'file:" url)
       (setq url (concat eww-search-prefix
                         (replace-regexp-in-string " " "+" url)))))
-  (setq eww-history-position 0)
   (url-retrieve url 'eww-render (list url)))
 
 ;;;###autoload
@@ -161,6 +160,7 @@ word(s) will be searched for via `eww-search-prefix'."
 	    (eww-display-image))
 	   (t
 	    (eww-display-raw charset)))
+	  (setq eww-history-position 0)
 	  (cond
 	   (point
 	    (goto-char point))