[Emacs-diffs] trunk r118353: Restore the header line after using `eww-readable'

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 118353
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2014-11-10 21:34:43 +0100
message:
  Restore the header line after using `eww-readable'
  
  (eww-readable): Copy over pertinent data from the parent page.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-10 20:30:30 +0000
+++ b/lisp/ChangeLog    2014-11-10 20:34:43 +0000
@@ -4,6 +4,7 @@
        to a single page, used throughout the file instead of the
        variables `eww-current-url', `eww-current-dom',
        `eww-current-source', and `eww-current-title'.
+       (eww-readable): Copy over pertinent data from the parent page.
 
        * net/eww.el: Remove `eww-next-url', `eww-previous-url',
        `eww-up-url', `eww-home-url', `eww-start-url' and

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2014-11-10 20:30:30 +0000
+++ b/lisp/net/eww.el   2014-11-10 20:34:43 +0000
@@ -419,10 +419,10 @@
 contains the main textual portion, leaving out navigation menus and
 the like."
   (interactive)
-  (let* ((source (plist-get eww-data :source))
+  (let* ((old-data eww-data)
         (dom (shr-transform-dom
               (with-temp-buffer
-                (insert source)
+                (insert (plist-get old-data :source))
                 (condition-case nil
                     (decode-coding-region (point-min) (point-max) 'utf-8)
                   (coding-system-error nil))
@@ -432,7 +432,9 @@
     (eww-display-html nil nil
                      (shr-retransform-dom
                       (eww-highest-readability dom)))
-    (plist-put eww-data :source source)))
+    (dolist (elem '(:source :url :title :next :previous :up))
+      (plist-put eww-data elem (plist-get old-data elem)))
+    (eww-update-header-line-format)))
 
 (defun eww-score-readability (node)
   (let ((score -1))