[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r112959: lisp/gnus/eww.el (eww): Prepend urls with h
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] trunk r112959: lisp/gnus/eww.el (eww): Prepend urls with http:// if scheme is missing |
Date: |
Thu, 13 Jun 2013 06:07:48 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112959
revision-id: address@hidden
parent: address@hidden
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2013-06-13 06:07:43 +0000
message:
lisp/gnus/eww.el (eww): Prepend urls with http:// if scheme is missing
(eww-mode): Use `define-derived-mode'
(eww-parse-headers): Parse headers from beginning of buffer so that file://
links work
(eww-detect-charset): Detect charset from the <meta> tag
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-12 22:32:33 +0000
+++ b/lisp/gnus/ChangeLog 2013-06-13 06:07:43 +0000
@@ -1,3 +1,14 @@
+2013-06-13 RĂ¼diger Sonderfeld <address@hidden>
+
+ * eww.el (eww): Prepend urls with http:// if scheme is missing.
+ (eww-mode): Use `define-derived-mode'.
+ (eww-parse-headers): Parse headers from beginning of buffer so that
+ file:// links work.
+
+2013-06-13 Katsumi Yamaoka <address@hidden>
+
+ * eww.el (eww-detect-charset): Detect charset from the <meta> tag.
+
2013-06-12 Lars Magne Ingebrigtsen <address@hidden>
* shr.el (shr-tag-svg): Ignore SVG elements, because we don't know how
=== modified file 'lisp/gnus/eww.el'
--- a/lisp/gnus/eww.el 2013-06-12 01:38:23 +0000
+++ b/lisp/gnus/eww.el 2013-06-13 06:07:43 +0000
@@ -36,8 +36,22 @@
(defun eww (url)
"Fetch URL and render the page."
(interactive "sUrl: ")
+ (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url)
+ (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* ((headers (eww-parse-headers))
(content-type
@@ -47,6 +61,8 @@
(charset (intern
(downcase
(or (cdr (assq 'charset (cdr content-type)))
+ (eww-detect-charset (equal (car content-type)
+ "text/html"))
"utf8"))))
(data-buffer (current-buffer)))
(unwind-protect
@@ -64,6 +80,7 @@
(defun eww-parse-headers ()
(let ((headers nil))
+ (goto-char (point-min))
(while (and (not (eobp))
(not (eolp)))
(when (looking-at "\\([^:]+\\): *\\(.*\\)")
@@ -129,17 +146,12 @@
;;(define-key map "n" 'eww-next-url)
map))
-(defun eww-mode ()
+(define-derived-mode eww-mode nil "eww"
"Mode for browsing the web.
\\{eww-mode-map}"
- (interactive)
- (setq major-mode 'eww-mode
- mode-name "eww")
(set (make-local-variable 'eww-current-url) 'author)
- (set (make-local-variable 'browse-url-browser-function) 'eww-browse-url)
- ;;(setq buffer-read-only t)
- (use-local-map eww-mode-map))
+ (set (make-local-variable 'browse-url-browser-function) 'eww-browse-url))
(defun eww-browse-url (url &optional new-window)
(push (list eww-current-url (point))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r112959: lisp/gnus/eww.el (eww): Prepend urls with http:// if scheme is missing,
Katsumi Yamaoka <=