diff options
| author | Andreas Schwab | 2012-07-10 11:42:48 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2012-07-10 11:42:48 +0200 |
| commit | 9598ddae26dfdd5bbdb2aa901ef889ce1723a0e3 (patch) | |
| tree | 4be4f8e45e75932f5be88b8acbd21615da78d7ef | |
| parent | aa7aaf8f0bf845b57961dff1b702098e50cb16ee (diff) | |
| download | emacs-9598ddae26dfdd5bbdb2aa901ef889ce1723a0e3.tar.gz emacs-9598ddae26dfdd5bbdb2aa901ef889ce1723a0e3.zip | |
* shr.el (shr-expand-url): Handle URL starting with `//'.
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 3 |
2 files changed, 7 insertions, 0 deletions
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 @@ | |||
| 1 | 2012-07-10 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * shr.el (shr-expand-url): Handle URL starting with `//'. | ||
| 4 | |||
| 1 | 2012-06-10 Toke Høiland-Jørgensen <toke@toke.dk> (tiny change) | 5 | 2012-06-10 Toke Høiland-Jørgensen <toke@toke.dk> (tiny change) |
| 2 | 6 | ||
| 3 | * nnmaildir.el (nnmaildir-request-expire-articles): Ensure that `time' | 7 | * 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." | |||
| 445 | (string-match "\\`[a-z]*:" url) | 445 | (string-match "\\`[a-z]*:" url) |
| 446 | (not shr-base)) | 446 | (not shr-base)) |
| 447 | url) | 447 | url) |
| 448 | ((and (string-match "\\`//" url) | ||
| 449 | (string-match "\\`[a-z]*:" shr-base)) | ||
| 450 | (concat (match-string 0 shr-base) url)) | ||
| 448 | ((and (not (string-match "/\\'" shr-base)) | 451 | ((and (not (string-match "/\\'" shr-base)) |
| 449 | (not (string-match "\\`/" url))) | 452 | (not (string-match "\\`/" url))) |
| 450 | (concat shr-base "/" url)) | 453 | (concat shr-base "/" url)) |