From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Albinus <michael.albinus@gmx.de>
Subject: Re: [Patch] org-display-inline-images: Add support for remote images
Date: Tue, 25 Nov 2014 16:39:02 +0100
Message-ID: <87bnnv1e95.fsf@gmx.de>
References: <CAKHbGXV-iY9ucXohWrMBBWHF5dfJrgp8237Vk6JXO743Q-LFOQ@mail.gmail.com>
	<87vbm3of2o.fsf@selenimh.mobile.lan>
	<CAKHbGXW1ChE7q8iyKrR6PAQsDDu52t=udMe4Jsyn0vB00=4+yw@mail.gmail.com>
	<CAKHbGXURH9vm1V3Zk2Su1Z7Ac9s+cpFasdmy-g46ysHMS0_TwQ@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52917)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.albinus@gmx.de>) id 1XtICv-0002Ws-ND
	for emacs-orgmode@gnu.org; Tue, 25 Nov 2014 10:39:20 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <michael.albinus@gmx.de>) id 1XtICp-00041Z-Dd
	for emacs-orgmode@gnu.org; Tue, 25 Nov 2014 10:39:13 -0500
Received: from mout.gmx.net ([212.227.15.19]:50213)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.albinus@gmx.de>) id 1XtICp-00041K-2x
	for emacs-orgmode@gnu.org; Tue, 25 Nov 2014 10:39:07 -0500
In-Reply-To: <CAKHbGXURH9vm1V3Zk2Su1Z7Ac9s+cpFasdmy-g46ysHMS0_TwQ@mail.gmail.com>
	(Kit-Yan Choi's message of "Tue, 25 Nov 2014 10:29:35 -0500")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Kit-Yan Choi <kit@kychoi.org>
Cc: emacs-orgmode@gnu.org

Kit-Yan Choi <kit@kychoi.org> writes:

> Ah my apologies. I forgot I had to use `file-name-directory' for
> creating the path to the temporary directory (too long ago since I did
> this). Here is the corrected version.
>
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -19340,7 +19340,7 @@ boundaries."
> (not (cdr (org-element-contents parent)))))
> (org-string-match-p file-extension-re
> (org-element-property :path link)))
> - (let ((file (expand-file-name (org-element-property :path link))))
> + (let ((file (substitute-in-file-name (expand-file-name
> (org-element-property :path link)))))
> (when (file-exists-p file)
> (let ((width
> ;; Apply `org-image-actual-width' specifications.
> @@ -19378,10 +19378,25 @@ boundaries."
> 'org-image-overlay)))
> (if (and (car-safe old) refresh)
> (image-refresh (overlay-get (cdr old) 'display))
> - (let ((image (create-image file
> - (and width 'imagemagick)
> - nil
> - :width width)))
> + (let ((image 
> + (create-image (if (org-file-remote-p file)
> + (let* ((tramp-tmpdir (concat
> + (if (featurep 'xemacs)
> + (temp-directory)
> + temporary-file-directory)
> + "/tramp"
> + (file-name-directory (expand-file-name file))))
> + (newname (concat
> + tramp-tmpdir 
> + (file-name-nondirectory (expand-file-name file)))))
> + (make-directory tramp-tmpdir t)
> + (if (file-newer-than-file-p file newname)
> + (copy-file file newname t t))
> + newname)
> + file)
> + (and width 'imagemagick)
> + nil
> + :width width)))
> (when image
> (let* ((link
> ;; If inline image is the description

This code looks much to complicate to me. Wouldn't a simple
file-local-copy suffice? You don't need to care whether the file is
remote (let Tramp do the job) or local (there won't be a copy).

Best regards, Michael.