[Emacs-diffs] trunk r113169: (eww) Reimplement the history functionality

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113169
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-25 16:59:13 +0200
message:
  (eww) Reimplement the history functionality
  
  * net/eww.el (eww-back-url): Implement the history by stashing all
  the data into a list.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-25 13:07:04 +0000
+++ b/lisp/ChangeLog    2013-06-25 14:59:13 +0000
@@ -1,3 +1,8 @@
+2013-06-25  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/eww.el (eww-back-url): Implement the history by stashing all
+       the data into a list.
+
 2013-06-25  Stefan Monnier  <address@hidden>
 
        * files-x.el (read-file-local-variable-value): Use read-from-minibuffer

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-06-24 17:42:22 +0000
+++ b/lisp/net/eww.el   2013-06-25 14:59:13 +0000
@@ -339,7 +339,9 @@
 (defun eww-browse-url (url &optional new-window)
   (when (and (equal major-mode 'eww-mode)
             eww-current-url)
-    (push (list eww-current-url (point))
+    (push (list :url eww-current-url
+               :point (point)
+               :text (buffer-string))
          eww-history))
   (eww url))
 
@@ -354,8 +356,12 @@
   (interactive)
   (when (zerop (length eww-history))
     (error "No previous page"))
-  (let ((prev (pop eww-history)))
-    (url-retrieve (car prev) 'eww-render (list (car prev) (cadr prev)))))
+  (let ((prev (pop eww-history))
+       (inhibit-read-only t))
+    (erase-buffer)
+    (insert (plist-get prev :text))
+    (goto-char (plist-get prev :point))
+    (setq eww-current-url (plist-get prev :url))))
 
 (defun eww-next-url ()
   "Go to the page marked `next'.