[Emacs-diffs] emacs-24 r116964: Fix relative links to parent directories in shr

[João Távora]

------------------------------------------------------------
revno: 116964
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17217
committer: João Távora <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-04-14 23:01:54 +0100
message:
  Fix relative links to parent directories in shr
  
  * lisp/net/shr.el (shr-expand-url): Use `expand-file-name' for relative
  links. .
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/shr.el                shr.el-20101002102929-yfzewk55rsg0mn93-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-14 02:21:12 +0000
+++ b/lisp/ChangeLog    2014-04-14 22:01:54 +0000
@@ -1,3 +1,8 @@
+2014-04-14  João Távora  <address@hidden>
+
+       * net/shr.el (shr-expand-url): Use `expand-file-name' for relative
+       links.  (Bug#17217).
+
 2014-04-14  YAMAMOTO Mitsuharu  <address@hidden>
 
        * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):

=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el   2014-03-05 18:44:58 +0000
+++ b/lisp/net/shr.el   2014-04-14 22:01:54 +0000
@@ -610,7 +610,7 @@
         (concat (nth 3 base) url))
        (t
         ;; Totally relative.
-        (concat (car base) (cadr base) url))))
+        (concat (car base) (expand-file-name url (cadr base))))))
 
 (defun shr-ensure-newline ()
   (unless (zerop (current-column))