aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2013-06-26 00:29:01 +0200
committerLars Magne Ingebrigtsen2013-06-26 00:29:01 +0200
commit26bf2b82d8a028a42cf8ad8f0aa284561c4cde7f (patch)
tree8ffa9ec106ee0e60f1d7fc2898d5ec854cbccd67
parent8308f184984d5c10fee62990d8a01abcec7f2160 (diff)
downloademacs-26bf2b82d8a028a42cf8ad8f0aa284561c4cde7f.tar.gz
emacs-26bf2b82d8a028a42cf8ad8f0aa284561c4cde7f.zip
(eww-render): Move the history reset to the correct buffer.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/net/eww.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10b5daaac04..493052d4dcb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
3 * net/eww.el: Rework history traversal. When going forward/back, 3 * net/eww.el: Rework history traversal. When going forward/back,
4 put these actions into the history, too, so that they can be 4 put these actions into the history, too, so that they can be
5 replayed. 5 replayed.
6 (eww-render): Move the history reset to the correct buffer.
6 7
72013-06-25 Juri Linkov <juri@jurta.org> 82013-06-25 Juri Linkov <juri@jurta.org>
8 9
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'."
118 (unless (string-match-p "\\'file:" url) 118 (unless (string-match-p "\\'file:" url)
119 (setq url (concat eww-search-prefix 119 (setq url (concat eww-search-prefix
120 (replace-regexp-in-string " " "+" url))))) 120 (replace-regexp-in-string " " "+" url)))))
121 (setq eww-history-position 0)
122 (url-retrieve url 'eww-render (list url))) 121 (url-retrieve url 'eww-render (list url)))
123 122
124;;;###autoload 123;;;###autoload
@@ -161,6 +160,7 @@ word(s) will be searched for via `eww-search-prefix'."
161 (eww-display-image)) 160 (eww-display-image))
162 (t 161 (t
163 (eww-display-raw charset))) 162 (eww-display-raw charset)))
163 (setq eww-history-position 0)
164 (cond 164 (cond
165 (point 165 (point
166 (goto-char point)) 166 (goto-char point))