From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony day Subject: [PATCH] org-insert-link: allow ido usage when inserting links Date: Fri, 14 Sep 2012 19:21:50 +1000 Message-ID: <5CE03302-7C87-44BE-B4AF-A6A92C96C803@gmail.com> Mime-Version: 1.0 (Mac OS X Mail 6.0 \(1486\)) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([208.118.235.92]:35491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCS66-000627-FB for emacs-orgmode@gnu.org; Fri, 14 Sep 2012 05:22:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TCS60-0004LY-2q for emacs-orgmode@gnu.org; Fri, 14 Sep 2012 05:22:02 -0400 Received: from mail-oa0-f41.google.com ([209.85.219.41]:56420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCS5z-0004LR-TY for emacs-orgmode@gnu.org; Fri, 14 Sep 2012 05:21:55 -0400 Received: by oagj6 with SMTP id j6so2916317oag.0 for ; Fri, 14 Sep 2012 02:21:55 -0700 (PDT) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: emacs-orgmode@gnu.org This time with patch inlined. I had a look through and couldn't see an obvious reason why you can't = use ido with org-insert-link, so here's a patch to enable it. I haven't looked at using ido for editing links yet, but I figure = org-capture would be a good pattern to do this. The other thought here = is to add an 'org:' link type so you can fire up ido just like = org-capture (not sure what non-ido org-capture looks like). This is my first patch, so please let me know if I'm not doing things = right. Tony [PATCH] org-insert-link: allow ido usage when inserting links * lisp/org.el (org-insert-link): added all-links to cleanly create = prefix+stored links for use in ido (org-i-read-file-name): new defun to allow ido to read a file: link if = allowed TINYCHANGE --- lisp/org.el | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 1c18d70..a918cfc 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9397,7 +9397,7 @@ be used as the default description." tmphist ; byte-compile incorrectly complains about this (link link-location) (abbrevs org-link-abbrev-alist-local) - entry file all-prefixes auto-desc) + entry file all-links all-prefixes auto-desc) (cond (link-location) ; specified by arg, just use it. ((org-in-regexp org-bracket-link-regexp 1) @@ -9443,19 +9443,19 @@ Use TAB to complete link prefixes, then RET for = type-specific completion support org-link-types)) (unwind-protect (progn + (setq all-links (append + (mapcar 'car org-stored-links) + (mapcar 'cadr org-stored-links) + (mapcar (lambda (x) (concat x ":")) + all-prefixes))) + (setq all-links (delete nil all-links)) (setq link - (let ((org-completion-use-ido nil) - (org-completion-use-iswitchb nil)) - (org-completing-read - "Link: " - (append - (mapcar (lambda (x) (list (concat x ":"))) - all-prefixes) - (mapcar 'car org-stored-links) - (mapcar 'cadr org-stored-links)) - nil nil nil - 'tmphist - (caar org-stored-links)))) + (org-completing-read + "Link: " + all-links + nil nil nil + 'tmphist + (caar org-stored-links))) (if (not (string-match "\\S-" link)) (error "No link selected")) (mapc (lambda(l) @@ -9542,7 +9542,7 @@ Use TAB to complete link prefixes, then RET for = type-specific completion support (defun org-file-complete-link (&optional arg) "Create a file link using completion." (let (file link) - (setq file (read-file-name "File: ")) + (setq file (org-i-read-file-name "File: ")) (let ((pwd (file-name-as-directory (expand-file-name "."))) (pwd1 (file-name-as-directory (abbreviate-file-name (expand-file-name "."))))) @@ -9560,6 +9560,17 @@ Use TAB to complete link prefixes, then RET for = type-specific completion support (t (setq link (concat "file:" file))))) link)) =20 +(defun org-i-read-file-name (&rest args) + "Read-file-name using `ido-mode' speedup if available." + (org-without-partial-completion + (if (and org-completion-use-ido + (fboundp 'ido-read-file-name) + (boundp 'ido-mode) ido-mode + (listp (second args))) + (let ((ido-enter-matching-directory nil)) + (apply 'ido-read-file-name args)) + (apply 'read-file-name args)))) + (defun org-completing-read (&rest args) "Completing-read with SPACE being a normal character." (let ((enable-recursive-minibuffers t) --=20 1.7.12