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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10b5daaac04c0ae0cbb415a772d290d58d0862d6..493052d4dcb81d28940fe27636a0706647154c3c 100644 (file)
--- 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 eaff1a1b9855c4e2cf23c0887216de7ed0b5255e..61bb4235c34a7969fab2f16c439d992aa3e49658 100644 (file)
--- 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))