[Emacs-diffs] trunk r113154: eww improvements

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113154
revision-id: address@hidden
parent: address@hidden
author: Ivan Kanis <address@hidden>
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2013-06-24 15:42:07 +0200
message:
  eww improvements
  
  * net/eww.el (eww): Work more correctly for file: URLs.
  (eww-detect-charset): Allow quoted charsets.
  (eww-yank-page-url): New command and keystroke.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-24 07:07:08 +0000
+++ b/lisp/ChangeLog    2013-06-24 13:42:07 +0000
@@ -1,3 +1,9 @@
+2013-06-24  Ivan Kanis  <address@hidden>
+
+       * net/eww.el (eww): Work more correctly for file: URLs.
+       (eww-detect-charset): Allow quoted charsets.
+       (eww-yank-page-url): New command and keystroke.
+
 2013-06-24  Daiki Ueno  <address@hidden>
 
        * epg.el (epg-make-context): Check if PROTOCOL is valid; embed the

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-06-23 18:29:30 +0000
+++ b/lisp/net/eww.el   2013-06-24 13:42:07 +0000
@@ -116,8 +116,9 @@
            (> (length (split-string url "\\.")) 1))
       (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url)
         (setq url (concat "http://"; url)))
-    (setq url (concat eww-search-prefix
-                      (replace-regexp-in-string " " "+" url))))
+    (unless (string-match-p "^file:" url)
+      (setq url (concat eww-search-prefix
+                        (replace-regexp-in-string " " "+" url)))))
   (url-retrieve url 'eww-render (list url)))
 
 ;;;###autoload
@@ -189,7 +190,7 @@
        (pt (point)))
     (or (and html-p
             (re-search-forward
-             "<meta[\t\n\r ]+[^>]*charset=\"?\\([^\t\n\r \"/>]+\\)" nil t)
+             "<meta[\t\n\r ]+[^>]*charset=\"?\\([^\t\n\r \"/>]+\\)[\\\"'.*]" 
nil t)
             (goto-char pt)
             (match-string 1))
        (and (looking-at
@@ -330,6 +331,7 @@
     (define-key map "u" 'eww-up-url)
     (define-key map "t" 'eww-top-url)
     (define-key map "w" 'eww-browse-with-external-browser)
+    (define-key map "y" 'eww-yank-page-url)
     map))
 
 (define-derived-mode eww-mode nil "eww"
@@ -847,6 +849,10 @@
   (interactive)
   (funcall eww-external-browser eww-current-url))
 
+(defun eww-yank-page-url ()
+  (interactive)
+  (message eww-current-url)
+  (kill-new eww-current-url))
 (provide 'eww)
 
 ;;; eww.el ends here