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: Thu, 11 Oct 2012 15:19:19 +1100 Message-ID: <9264AF9E-715F-45FF-88D1-8EAB5E94E751@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]:47258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMAF5-0001hK-2s for emacs-orgmode@gnu.org; Thu, 11 Oct 2012 00:19:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMAF3-0007WI-Rt for emacs-orgmode@gnu.org; Thu, 11 Oct 2012 00:19:27 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:43600) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMAF3-0007W8-LG for emacs-orgmode@gnu.org; Thu, 11 Oct 2012 00:19:25 -0400 Received: by mail-pa0-f41.google.com with SMTP id fa10so1454356pad.0 for ; Wed, 10 Oct 2012 21:19:24 -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 =46rom a8f301277e15bc786fa63bbcce3ba1afb85c46aa Mon Sep 17 00:00:00 2001 From: Tony Day Date: Mon, 10 Sep 2012 13:54:38 +1000 Subject: [PATCH 41/41] org-insert-link: allow ido usage when inserting = links * lisp/org.el (org-insert-link): added all-links to cleanly create = prefix+st (org-i-read-file-name): new defun to allow ido to read a file: link if = allowed --- 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.9.6 (Apple Git-31.1)