Merge from emacs-24

[gnu-emacs] / lisp / gnus / shr.el

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index bf6e57e8d79306214ef1ab12bfa106b8be5fcf8e..e7a6c5d20810b3bd0c4a7db432acb02859189532 100644 (file)
--- 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))