From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony day Subject: [PATCH] * org-insert-link: use ido when inserting links Date: Fri, 12 Oct 2012 14:58:29 +1100 Message-ID: <04D0E787-A8A1-4246-8DD2-D607E38D61BA@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]:40074) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMWOS-0005rL-Bh for emacs-orgmode@gnu.org; Thu, 11 Oct 2012 23:58:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMWOR-0006eF-8c for emacs-orgmode@gnu.org; Thu, 11 Oct 2012 23:58:36 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:62226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMWOR-0006e8-16 for emacs-orgmode@gnu.org; Thu, 11 Oct 2012 23:58:35 -0400 Received: by mail-pa0-f41.google.com with SMTP id fa10so2688034pad.0 for ; Thu, 11 Oct 2012 20:58:34 -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 Cc: Nicolas Goaziou org.el (org-insert-link): removed a list within the list of link creation that was causing a bug when using ido. Removed the hard coded iswitch and ido switches. Changed the order of prefixes so http came up first. (org-iread-file-name): created a function that can use ido-read-file-name if flagged as ok. (org-file-complete-link): referenced org-iread-file-name. --- lisp/org.el | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index bdfc919..41c2572 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9311,24 +9311,22 @@ Use TAB to complete link prefixes, then RET for = type-specific completion support ;; Fake a link history, containing the stored links. (setq tmphist (append (mapcar 'car org-stored-links) org-insert-link-history)) - (setq all-prefixes (append (mapcar 'car abbrevs) - (mapcar 'car org-link-abbrev-alist) - org-link-types)) + (setq all-prefixes (append org-link-types + (mapcar 'car abbrevs) + (mapcar 'car org-link-abbrev-alist))) (unwind-protect (progn (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: " + (append + (mapcar 'cadr org-stored-links) + (mapcar (lambda (x) (concat x ":")) + all-prefixes) + (mapcar 'car org-stored-links)) + nil nil nil + 'tmphist + (cadr org-stored-links))) (if (not (string-match "\\S-" link)) (error "No link selected")) (mapc (lambda(l) @@ -9422,7 +9420,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-iread-file-name "File: ")) (let ((pwd (file-name-as-directory (expand-file-name "."))) (pwd1 (file-name-as-directory (abbreviate-file-name (expand-file-name "."))))) @@ -9440,6 +9438,20 @@ Use TAB to complete link prefixes, then RET for = type-specific completion support (t (setq link (concat "file:" file))))) link)) =20 +(defun org-iread-file-name (&rest args) + "Read-file-name using `ido-mode' speedup if available. +ARGS are arguments that may be passed to `ido-read-file-name' or = `read-file-name'. +See `read-file-name' for a description of parameters. +" + (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)