Merge from emacs-24

2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 41966497607..6c1d2b9b624 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-17  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * shr.el (shr-expand-url): Handle URL starting with `//'.
+
+2012-07-17  Toke Høiland-Jørgensen  <toke@toke.dk>  (tiny change)
 2012-07-13  Chong Yidong  <cyd@gnu.org>
 
         * smime.el (smime-certificate-info): Set buffer-read-only directly,
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index bf6e57e8d79..e7a6c5d2081 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -484,6 +484,9 @@ size, and full-buffer size."
         (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))