emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[O] [PATCH] org-insert-link: allow ido usage when inserting links


From: tony day
Subject: [O] [PATCH] org-insert-link: allow ido usage when inserting links
Date: Thu, 11 Oct 2012 15:19:19 +1100

From a8f301277e15bc786fa63bbcce3ba1afb85c46aa Mon Sep 17 00:00:00 2001
From: Tony Day <address@hidden>
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))
 
+(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)
-- 
1.7.9.6 (Apple Git-31.1)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]