-

3 files changed, 44 insertions, 7 deletions

diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index 10a466361ef..ee812bde82d 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -3951,7 +3951,8 @@
 
 2014-12-22  Artur Malabarba  <bruce.connor.am@gmail.com>
 
-        * let-alist.el (let-alist): Use `make-symbol' instead of `gensym'.
+        * emacs-lisp/let-alist.el (let-alist): Use `make-symbol'
+        instead of `gensym'.
 
 2014-12-20  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -3963,7 +3964,7 @@
 
 2014-12-19  Artur Malabarba  <bruce.connor.am@gmail.com>
 
-        * let-alist.el (let-alist): Enable access to deeper alists by
+        * emacs-lisp/let-alist.el (let-alist): Enable access to deeper alists by
         using dots inside the dotted symbols.
 
 2014-12-19  Alan Mackenzie  <acm@muc.de>
@@ -4005,7 +4006,7 @@
 
 2014-12-18  Artur Malabarba  <bruce.connor.am@gmail.com>
 
-        * let-alist.el (let-alist): Evaluate the `alist' argument only once.
+        * emacs-lisp/let-alist.el (let-alist): Evaluate the `alist' argument only once.
 
 2014-12-18  Sam Steingold  <sds@gnu.org>
 
@@ -4141,7 +4142,7 @@
 
 2014-12-14  Artur Malabarba  <bruce.connor.am@gmail.com>
 
-        * let-alist.el: Add lexical binding.
+        * emacs-lisp/let-alist.el: Add lexical binding.
 
 2014-12-14  Steve Purcell  <steve@sanityinc.com>  (tiny change)
 
@@ -4273,7 +4274,7 @@
 
 2014-12-10  Artur Malabarba  <bruce.connor.am@gmail.com>
 
-        * let-alist.el: Add new package and macro.
+        * emacs-lisp/let-alist.el: Add new package and macro.
 
 2014-12-10  Eric S. Raymond  <esr@snark.thyrsus.com>
 
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 2bda97f95d0..edf91ab6000 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -36,6 +36,7 @@
 ;; Function                           Browser     Earliest version
 ;; browse-url-mozilla                 Mozilla     Don't know
 ;; browse-url-firefox                 Firefox     Don't know (tried with 1.0.1)
+;; browse-url-chrome                  Chrome      47.0.2526.111
 ;; browse-url-chromium                Chromium    3.0
 ;; browse-url-epiphany                Epiphany    Don't know
 ;; browse-url-conkeror                Conkeror    Don't know
@@ -147,6 +148,7 @@ regexp should probably be \".\" to specify a default browser."
           (function-item :tag "eww" :value  eww-browse-url)
           (function-item :tag "Mozilla" :value  browse-url-mozilla)
           (function-item :tag "Firefox" :value browse-url-firefox)
+          (function-item :tag "Google Chrome" :value browse-url-chrome)
           (function-item :tag "Chromium" :value browse-url-chromium)
           (function-item :tag "Epiphany" :value  browse-url-epiphany)
           (function-item :tag "Conkeror" :value  browse-url-conkeror)
@@ -259,6 +261,22 @@ Defaults to the value of `browse-url-firefox-arguments' at the time
 (make-obsolete-variable 'browse-url-firefox-startup-arguments
                         "it no longer has any effect." "24.5")
 
+(defcustom browse-url-chrome-program
+  (let ((candidates '("google-chrome-stable" "google-chrome")))
+    (while (and candidates (not (executable-find (car candidates))))
+      (setq candidates (cdr candidates)))
+    (or (car candidates) "chromium"))
+  "The name by which to invoke Chromium."
+  :type 'string
+  :version "24.1"
+  :group 'browse-url)
+
+(defcustom browse-url-chrome-arguments nil
+  "A list of strings to pass to Google Chrome as arguments."
+  :type '(repeat (string :tag "Argument"))
+  :version "24.1"
+  :group 'browse-url)
+
 (defcustom browse-url-chromium-program
   (let ((candidates '("chromium" "chromium-browser")))
     (while (and candidates (not (executable-find (car candidates))))
@@ -902,6 +920,7 @@ instead of `browse-url-new-window-flag'."
     ((browse-url-can-use-xdg-open) 'browse-url-xdg-open)
 ;;;    ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
     ((executable-find browse-url-mozilla-program) 'browse-url-mozilla)
+    ((executable-find browse-url-chrome-program) 'browse-url-chrome)
     ((executable-find browse-url-firefox-program) 'browse-url-firefox)
     ((executable-find browse-url-chromium-program) 'browse-url-chromium)
 ;;;    ((executable-find browse-url-galeon-program) 'browse-url-galeon)
@@ -1126,6 +1145,22 @@ The optional argument NEW-WINDOW is not used."
             browse-url-chromium-arguments
             (list url)))))
 
+(defun browse-url-chrome (url &optional _new-window)
+  "Ask the Google Chrome WWW browser to load URL.
+Default to the URL around or before point.  The strings in
+variable `browse-url-chrome-arguments' are also passed to
+Google Chrome.
+The optional argument NEW-WINDOW is not used."
+  (interactive (browse-url-interactive-arg "URL: "))
+  (setq url (browse-url-encode-url url))
+  (let* ((process-environment (browse-url-process-environment)))
+    (apply 'start-process
+           (concat "google-chrome " url) nil
+           browse-url-chrome-program
+           (append
+            browse-url-chrome-arguments
+            (list url)))))
+
 ;;;###autoload
 (defun browse-url-galeon (url &optional new-window)
   "Ask the Galeon WWW browser to load URL.
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 3c2e74799af..cb231270b33 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -323,8 +323,9 @@ Currently this means either text/html or application/xhtml+xml."
   (let* ((headers (eww-parse-headers))
          (content-type
           (mail-header-parse-content-type
-           (or (cdr (assoc "content-type" headers))
-               "text/plain")))
+           (if (zerop (length (cdr (assoc "content-type" headers))))
+               "text/plain"
+             (cdr (assoc "content-type" headers)))))
          (charset (intern
                    (downcase
                     (or (cdr (assq 'charset (cdr content-type)))