[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] [PATCH] org-insert-link: allow ido usage when inserting links
From: |
Giovanni Ridolfi |
Subject: |
Re: [O] [PATCH] org-insert-link: allow ido usage when inserting links |
Date: |
Fri, 14 Sep 2012 10:39:40 +0100 (BST) |
Hi, Tony,
thanks for submitting the patch,
however I suspect it is longer than 20 lines.
Therefore it could be applied only if you've
assigned the copyright to the FSF. For more infos please refer to:
http://orgmode.org/worg/org-contribute.html
Would it be possible for you?
Thanks,
Giovanni
----- Messaggio originale -----
Da: tony day <address@hidden>
A: address@hidden
Cc:
Inviato: Venerdì 14 Settembre 2012 11:21
Oggetto: [O] [PATCH] org-insert-link: allow ido usage when inserting links
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))
+(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.12