From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [Patch] file protocol in HTML links Date: Thu, 27 May 2010 23:51:09 +0200 Message-ID: <1A605A00-53AE-47DA-BF59-57E9044E4EE4@gmail.com> References: <874ohvm2bk.fsf@gmx.de> <87zkznkn2p.fsf@gmx.de> <99BD81F0-3064-43B7-9BF9-65EC68802056@gmail.com> <87wrupyqo8.fsf@gmx.de> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=50744 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHkz8-0005H8-IN for emacs-orgmode@gnu.org; Thu, 27 May 2010 17:51:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OHkyv-0005wy-Ei for emacs-orgmode@gnu.org; Thu, 27 May 2010 17:51:14 -0400 Received: from ey-out-1920.google.com ([74.125.78.145]:39140) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHkyv-0005wo-9K for emacs-orgmode@gnu.org; Thu, 27 May 2010 17:51:13 -0400 Received: by ey-out-1920.google.com with SMTP id 13so382921eye.2 for ; Thu, 27 May 2010 14:51:12 -0700 (PDT) In-Reply-To: <87wrupyqo8.fsf@gmx.de> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Sebastian Rose Cc: Emacs-orgmode mailing list On May 27, 2010, at 11:34 PM, Sebastian Rose wrote: > Carsten Dominik writes: >> Hi Sebastian, >> >> can you then please make a patch that reverts the incorrect fix and >> installs >> your better version? Against the current master? > > > Hi Carsten, > > > I saw you applied the patch. There is nothing I'd want to remove in > the > code, as it is indeed OK to prepend the protocol part to all the other > URIs. > Is there still something I should do? Inly if there are further bug reports. Thanks for looking into this. - Carsten > > > Sebastian > > >> Thanks! >> >> - Carsten >> >> On May 26, 2010, at 11:51 AM, Sebastian Rose wrote: >> >>> Sebastian Rose writes: >>>> The appended patch removes the protocol part from link URIs, if the >>>> protocol is file. Neccessary, to show images again and make links >>>> work. >>>> >>>> >>>> diff --git a/lisp/org-html.el b/lisp/org-html.el >>>> index d5f4775..8f7d0f3 100644 >>>> --- a/lisp/org-html.el >>>> +++ b/lisp/org-html.el >>>> @@ -640,7 +640,7 @@ MAY-INLINE-P allows inlining it as an image." >>>> (setq thefile >>>> (let >>>> ((str (org-export-html-format-href thefile))) >>>> - (if type >>>> + (if (and type (not (string= "file" type))) >>>> (concat type ":" str) >>>> str))) >>> >>> Hi, >>> >>> >>> I just pulled and saw it was fixed already - but in a wrong way, I >>> believe. How about an absolute link URL with a different protocol >>> like >>> gopher? >>> >>> I think adding the protocol should be done, if the protocol is >>> different >>> from that used to deliver the file which contains the link. >>> >>> There's no need to add the protocol to an absolute path. >>> >>> >>> >>> Sebastian >>> >>> _______________________________________________ >>> Emacs-orgmode mailing list >>> Please use `Reply All' to send replies to the list. >>> Emacs-orgmode@gnu.org >>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode >> >> - Carsten - Carsten