[Emacs-diffs] trunk r113043: lisp/gnus/eww.el (eww-detect-charset): Improve regexp; move backward

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 113043
revision-id: address@hidden
parent: address@hidden
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-18 09:29:20 +0000
message:
  lisp/gnus/eww.el (eww-detect-charset): Improve regexp; move backward
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/eww.el               eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-06-18 07:16:09 +0000
+++ b/lisp/gnus/ChangeLog       2013-06-18 09:29:20 +0000
@@ -1,3 +1,7 @@
+2013-06-18  Katsumi Yamaoka  <address@hidden>
+
+       * eww.el (eww-detect-charset): Improve regexp; move backward.
+
 2013-06-18  Glenn Morris  <address@hidden>
 
        * mm-decode.el (widget-convert-button): Autoload.

=== modified file 'lisp/gnus/eww.el'
--- a/lisp/gnus/eww.el  2013-06-17 23:11:40 +0000
+++ b/lisp/gnus/eww.el  2013-06-18 09:29:20 +0000
@@ -64,18 +64,6 @@
     (setq url (concat "http://"; url)))
   (url-retrieve url 'eww-render (list url)))
 
-(defun eww-detect-charset (html-p)
-  (let ((case-fold-search t)
-       (pt (point)))
-    (or (and html-p
-            (re-search-forward
-             "<meta[\t\n\r ]+[^>]*charset=\\([^\t\n\r \"/>]+\\)" nil t)
-            (goto-char pt)
-            (match-string 1))
-       (and (looking-at
-             "[\t\n\r ]*<\\?xml[\t\n\r ]+[^>]*encoding=\"\\([^\"]+\\)")
-            (match-string 1)))))
-
 (defun eww-render (status url &optional point)
   (let ((redirect (plist-get status :redirect)))
     (when redirect
@@ -128,6 +116,18 @@
       (forward-line 1))
     headers))
 
+(defun eww-detect-charset (html-p)
+  (let ((case-fold-search t)
+       (pt (point)))
+    (or (and html-p
+            (re-search-forward
+             "<meta[\t\n\r ]+[^>]*charset=\"?\\([^\t\n\r \"/>]+\\)" nil t)
+            (goto-char pt)
+            (match-string 1))
+       (and (looking-at
+             "[\t\n\r ]*<\\?xml[\t\n\r ]+[^>]*encoding=\"\\([^\"]+\\)")
+            (match-string 1)))))
+
 (defun eww-display-html (charset url)
   (unless (eq charset 'utf8)
     (decode-coding-region (point) (point-max) charset))