[Emacs-diffs] /srv/bzr/emacs/trunk r103965: shr.el (shr-expand-url): Protect against null urls.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103965
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2011-04-21 02:22:56 +0000
message:
  shr.el (shr-expand-url): Protect against null urls.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-04-21 00:24:27 +0000
+++ b/lisp/gnus/ChangeLog       2011-04-21 02:22:56 +0000
@@ -1,3 +1,7 @@
+2011-04-21  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * shr.el (shr-expand-url): Protect against null urls.
+
 2011-04-20  Lars Magne Ingebrigtsen  <address@hidden>
 
        * shr.el (shr-base): New binding.

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2011-04-21 00:24:27 +0000
+++ b/lisp/gnus/shr.el  2011-04-21 02:22:56 +0000
@@ -397,7 +397,8 @@
 (defun shr-expand-url (url)
   (cond
    ;; Absolute URL.
-   ((or (string-match "\\`[a-z]*:" url)
+   ((or (not url)
+       (string-match "\\`[a-z]*:" url)
        (not shr-base))
     url)
    ((and (not (string-match "/\\'" shr-base))