From: Andreas Schwab <schwab@linux-m68k.org>
Date: Tue, 10 Jul 2012 09:42:48 +0000 (+0200)
Subject: * shr.el (shr-expand-url): Handle URL starting with `//'.
X-Git-Tag: emacs-24.2~55
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9598ddae26dfdd5bbdb2aa901ef889ce1723a0e3;p=emacs.git

* shr.el (shr-expand-url): Handle URL starting with `//'.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9c406f75bf3..4ddf8b04e91 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-10  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* shr.el (shr-expand-url): Handle URL starting with `//'.
+
 2012-06-10  Toke Høiland-Jørgensen  <toke@toke.dk>  (tiny change)
 
 	* nnmaildir.el (nnmaildir-request-expire-articles): Ensure that `time'
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 42118298734..0d9b052f425 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -445,6 +445,9 @@ the URL of the image to the kill buffer instead."
 	(string-match "\\`[a-z]*:" url)
 	(not shr-base))
     url)
+   ((and (string-match "\\`//" url)
+	 (string-match "\\`[a-z]*:" shr-base))
+    (concat (match-string 0 shr-base) url))
    ((and (not (string-match "/\\'" shr-base))
 	 (not (string-match "\\`/" url)))
     (concat shr-base "/" url))