[gnus git] branch master updated: m0-7-71-g770a3e2 =1= (shr-expand-url): Expansion should chop off the bits after the last slash

       via  770a3e2fae94c221fbf7cd732eff8b1a5ff029f6 (commit)
      from  2ced5ad1e5c20c67071b08ea12039413229356fd (commit)


- Log -----------------------------------------------------------------
commit 770a3e2fae94c221fbf7cd732eff8b1a5ff029f6
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Jun 13 15:15:44 2013 +0200

    (shr-expand-url): Expansion should chop off the bits after the last slash

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76e0a52..befc688 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-06-13  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* shr.el (shr-expand-url): Expansion should chop off the bits after the
+	last slash.
+
 	* eww.el (eww-tag-select): Use the first value as the default value.
 
 2013-06-13  Rüdiger Sonderfeld  <[email protected]>
diff --git a/lisp/shr.el b/lisp/shr.el
index 0a2c698..8cb1663 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -492,7 +492,10 @@ size, and full-buffer size."
       url
     (let ((base shr-base))
       ;; Chop off query string.
-      (when (string-match "^\\([^?]+\\)[?]" base)
+      (when (string-match "\\`\\([^?]+\\)[?]" base)
+	(setq base (match-string 1 base)))
+      ;; Chop off the bit after the last slash.
+      (when (string-match "\\`\\(.*\\)[/][^/]+" base)
 	(setq base (match-string 1 base)))
       (cond
        ((and (string-match "\\`//" url)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    3 +++
 lisp/shr.el    |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project