From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregory@dynapse.com (Gregory J. Grubbs) Subject: Re: Display inline images patch Date: Thu, 10 Jun 2010 17:59:11 -0500 Message-ID: References: <20100531193031.GH2731@thinkpad.adamsinfoserv.com> <029e01cb07de$79d75380$6d85fa80$@com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from [140.186.70.92] (port=34233 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OMqil-0000PF-Pw for emacs-orgmode@gnu.org; Thu, 10 Jun 2010 18:59:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OMqik-0007Cw-A5 for emacs-orgmode@gnu.org; Thu, 10 Jun 2010 18:59:35 -0400 Received: from lo.gmane.org ([80.91.229.12]:58597) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OMqij-0007Cm-TS for emacs-orgmode@gnu.org; Thu, 10 Jun 2010 18:59:34 -0400 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OMqif-0006Ao-Vb for emacs-orgmode@gnu.org; Fri, 11 Jun 2010 00:59:29 +0200 Received: from 70.43.163.226.nw.nuvox.net ([70.43.163.226]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 11 Jun 2010 00:59:29 +0200 Received: from gregory by 70.43.163.226.nw.nuvox.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 11 Jun 2010 00:59:29 +0200 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: emacs-orgmode@gnu.org "Colin Fraizer" writes: > I use org-mode on Windows 7. It seems that the regexp for image files > excludes the ":" (colon) character. Could it be added to this: > "[-+./_0-9a-zA-Z]+" > to make this > "[-+./:_0-9a-zA-Z]+" > ? > I use a regexp for image files that adds characters often found in Windows paths, as shown in the following patch in function org-toggle-inline-images: --8<---------------cut here---------------start------------->8--- diff --git a/lisp/org.el b/lisp/org.el old mode 100644 new mode 100755 index ba4ea63..ef8a06c --- a/lisp/org.el +++ b/lisp/org.el @@ -15923,7 +15923,7 @@ BEG and END default to the buffer boundaries." (widen) (setq beg (or beg (point-min)) end (or end (point-max))) (goto-char (point-min)) - (let ((re (concat "\\[\\[\\(\\(file:\\)\\|\\([./~]\\)\\)\\([-+~./_0-9a-zA-Z]+" + (let ((re (concat "\\[\\[\\(\\(file:\\)\\|\\([./~]\\)\\)\\([-+~.:/\\_0-9a-zA-Z ]+" (substring (org-image-file-name-regexp) 0 -2) "\\)\\]" (if include-linked "" "\\]"))) old file ov img) --8<---------------cut here---------------end--------------->8--- It adds ':', space and backslash to the set of characters, so that things like the following work (org-insert-link sometimes inserts mixed back and forward slashes): --8<---------------cut here---------------start------------->8--- [[file:c:/cygwin/usr/share/pixmaps/xterm-color_48x48.xpm]] [[~/projects/appointment-soon.png]] [[file:c:\Documents and Settings\ggrubbs\projects/appointment-soon.png]] --8<---------------cut here---------------end--------------->8--- > -----Original Message----- > From: emacs-orgmode-bounces+orgmode=cfraizer.com@gnu.org > [mailto:emacs-orgmode-bounces+orgmode=cfraizer.com@gnu.org] On Behalf Of > Carsten Dominik > Sent: Tuesday, June 01, 2010 9:37 AM > To: Russell Adams > Cc: emacs-orgmode > Subject: Re: [Orgmode] Display inline images patch > > Hi Russel, > > looks like you are not running the latest version, I think this is > already fixed.... > > > - Carsten > > On May 31, 2010, at 9:30 PM, Russell Adams wrote: > >> I got irritated by my point jumping to the end of the buffer every >> time I toggled inline image display, so lets save excursion. ;] >> >> $ diff -Narub org.el~ org.el >> --- org.el~ 2010-05-20 10:12:45.000000000 -0500 >> +++ org.el 2010-05-31 14:28:21.000000000 -0500 >> @@ -15489,6 +15489,7 @@ >> is how it will work for export. When INCLUDE-LINKED is set, also >> links >> with a description part will be inlined." >> (interactive "P") >> + (save-excursion >> (org-remove-inline-images) >> (goto-char (point-min)) >> (let ((re (concat "\\[\\[\\(file:\\|\\./\\)\\(~?" >> "[-+./_0-9a-zA-Z]+" >> @@ -15501,7 +15502,7 @@ >> (setq ov (make-overlay (match-beginning 0) (match-end 0))) >> (overlay-put ov 'display (create-image file)) >> (overlay-put ov 'face 'default) >> - (push ov org-inline-image-overlays))))) >> + (push ov org-inline-image-overlays)))))) >> >> (defun org-remove-inline-images () >> "Remove inline display of images." >> >> >> >> >> >> >> ------------------------------------------------------------------ >> Russell Adams RLAdams@AdamsInfoServ.com >> >> PGP Key ID: 0x1160DCB3 http://www.adamsinfoserv.com/ >> >> Fingerprint: 1723 D8CA 4280 1EC9 557F 66E8 1154 E018 1160 DCB3 >> >> _______________________________________________ >> 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 > > > > > _______________________________________________ > 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 > > > _______________________________________________ > 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