[Patch] file protocol in HTML links

[Patch] file protocol in HTML links

[Sebastian Rose]

[-- Attachment #1: Type: text/plain, Size: 141 bytes --]

The appended patch removes the protocol part from link URIs, if the
protocol is file. Neccessary, to show images again and make links work.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-diff, Size: 384 bytes --]

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)))

[-- Attachment #3: Type: text/plain, Size: 30 bytes --]




Best wishes

    Sebastian

[-- Attachment #4: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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

Re: [Patch] file protocol in HTML links

[Sebastian Rose]

Sebastian Rose <sebastian_rose@gmx.de> 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

Re: [Patch] file protocol in HTML links

[Carsten Dominik]

Hi Sebastian,

can you then please make a patch that reverts the incorrect fix and  
installs your better version?  Against the current master?

Thanks!

- Carsten

On May 26, 2010, at 11:51 AM, Sebastian Rose wrote:

> Sebastian Rose <sebastian_rose@gmx.de> 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

Re: [Patch] file protocol in HTML links

[Sebastian Rose]

Carsten Dominik <carsten.dominik@gmail.com> 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?


   Sebastian


> Thanks!
>
> - Carsten
>
> On May 26, 2010, at 11:51 AM, Sebastian Rose wrote:
>
>> Sebastian Rose <sebastian_rose@gmx.de> 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

Re: [Patch] file protocol in HTML links

[Carsten Dominik]

On May 27, 2010, at 11:34 PM, Sebastian Rose wrote:

> Carsten Dominik <carsten.dominik@gmail.com> 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 <sebastian_rose@gmx.de> 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