From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 2 Nov 2014 23:02:01 +0000 (+0100)
Subject: Fix `eww-current-source' buffer confustion
X-Git-Tag: emacs-25.0.90~2635^2~593
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=816cad6e2414474b06ebb4f691fc1bdb9a8953a4;p=emacs.git

Fix `eww-current-source' buffer confustion

* net/eww.el (eww-display-html): Set `eww-current-source' in the
correct buffer.
(eww-view-source): Use it.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cee85522c81..eb374375198 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/eww.el (eww-display-html): Set `eww-current-source' in the
+	correct buffer.
+	(eww-view-source): Use it.
+
 2014-11-02  Ivan Shmakov <ivan@siamics.net>
 
 	* net/eww.el (eww): Recognize colon-delimited IPv6 addresses.
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 0f0a5924158..e4acd69ef4d 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -264,10 +264,11 @@ word(s) will be searched for via `eww-search-prefix'."
 	 (or document
 	     (list
 	      'base (list (cons 'href url))
-	      (libxml-parse-html-region (point) (point-max))))))
-    (setq eww-current-source (buffer-substring (point) (point-max)))
+	      (libxml-parse-html-region (point) (point-max)))))
+	(source (buffer-substring (point) (point-max))))
     (eww-setup-buffer)
-    (setq eww-current-dom document)
+    (setq eww-current-source source
+	  eww-current-dom document)
     (let ((inhibit-read-only t)
 	  (after-change-functions nil)
 	  (shr-target-id (url-target (url-generic-parse-url url)))
@@ -406,7 +407,7 @@ word(s) will be searched for via `eww-search-prefix'."
         (source eww-current-source))
     (with-current-buffer buf
       (delete-region (point-min) (point-max))
-      (insert (or eww-current-source "no source"))
+      (insert (or source "no source"))
       (goto-char (point-min))
       (when (fboundp 'html-mode)
         (html-mode)))