[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118265: Fix charset problems with the `R' command i
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] trunk r118265: Fix charset problems with the `R' command in eww |
Date: |
Mon, 03 Nov 2014 00:16:34 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118265
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2014-11-03 01:16:21 +0100
message:
Fix charset problems with the `R' command in eww
* net/eww.el (eww-display-html): The charset is called `utf-8',
not `utf8'.
(eww-readable): Decode the saved text correctly.
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-03 00:01:20 +0000
+++ b/lisp/ChangeLog 2014-11-03 00:16:21 +0000
@@ -1,3 +1,9 @@
+2014-11-03 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/eww.el (eww-display-html): The charset is called `utf-8',
+ not `utf8'.
+ (eww-readable): Decode the saved text correctly.
+
2014-11-02 Lars Magne Ingebrigtsen <address@hidden>
* net/eww.el (eww-readable): New command and keystroke.
=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el 2014-11-03 00:01:20 +0000
+++ b/lisp/net/eww.el 2014-11-03 00:16:21 +0000
@@ -256,7 +256,7 @@
(defun eww-display-html (charset url &optional document point)
(or (fboundp 'libxml-parse-html-region)
(error "This function requires Emacs to be compiled with libxml2"))
- (unless (eq charset 'utf8)
+ (unless (eq charset 'utf-8)
(condition-case nil
(decode-coding-region (point) (point-max) charset)
(coding-system-error nil)))
@@ -424,10 +424,14 @@
(dom (shr-transform-dom
(with-temp-buffer
(insert source)
+ (condition-case nil
+ (decode-coding-region (point-min) (point-max) 'utf-8)
+ (coding-system-error nil))
(libxml-parse-html-region (point-min) (point-max))))))
(eww-score-readability dom)
- (eww-display-html 'utf-8 nil (shr-retransform-dom
- (eww-highest-readability dom)))
+ (eww-display-html nil nil
+ (shr-retransform-dom
+ (eww-highest-readability dom)))
(setq eww-current-source source)))
(defun eww-score-readability (node)
@@ -437,6 +441,8 @@
(setq score -2))
((eq (car node) 'meta)
(setq score -1))
+ ((eq (car node) 'img)
+ (setq score 2))
((eq (car node) 'a)
(setq score (- (length (split-string
(or (cdr (assoc 'text (cdr node))) ""))))))
@@ -579,8 +585,8 @@
(let ((inhibit-read-only t))
(erase-buffer)
(insert (plist-get elem :text))
- (setq eww-current-source (plist-get elem :source))
- (setq eww-current-dom (plist-get elem :dom))
+ (setq eww-current-source (plist-get elem :source)
+ eww-current-dom (plist-get elem :dom))
(goto-char (plist-get elem :point))
(setq eww-current-url (plist-get elem :url)
eww-current-title (plist-get elem :title))
@@ -1105,7 +1111,7 @@
((and (url-target (url-generic-parse-url url))
(eww-same-page-p url eww-current-url))
(eww-save-history)
- (eww-display-html 'utf8 url eww-current-dom))
+ (eww-display-html 'utf-8 url eww-current-dom))
(t
(eww-browse-url url)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118265: Fix charset problems with the `R' command in eww,
Lars Ingebrigtsen <=