From: tony day <zygomega@gmail.com>
To: Nicolas Goaziou <n.goaziou@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: [PATCH] * org-insert-link: use ido when inserting links
Date: Sat, 13 Oct 2012 15:42:07 +1100 [thread overview]
Message-ID: <A3AD1C6C-5E86-42E2-976D-F65FF6F5075B@gmail.com> (raw)
In-Reply-To: <87a9vr3ldr.fsf@gmail.com>
On 12 Oct 2012, at 23:50, Nicolas Goaziou <n.goaziou@gmail.com> wrote:
> Thanks for considering my suggestions. So here are new ones:
And a revised patch for your reviewing pleasure :)
> Judging by your test case, it's the
>
> (mapcar 'cadr org-stored-links)
>
> part that cause problems, isn't it? I'm not sure why it should belong to
> the provided collection. Wouldn't dropping it solve the ido problem?
No, but the combination of removing this and removing the list wrapper solves the ordering issues I was trying to fix. I wasn't sure why the cadr was there either.
>> Removed the hard coded iswitch and ido switches.
>
> Just wondering: what will happen if an user wants to use iswitchb?
Works for the first part and reverts to no assist on file: selection.
>> Changed the order of prefixes so http came up first.
>
> Please do not add unrelated "features" during a patch review. By the
> way, I'm not sure to agree with you: it /is/ meaningful to have
> user-defined link abbrevs before default types.
Excellent advice (yes, even the nitpicks :)
From 31c9855ca6db95d10ca09611f749d74074b19b08 Mon Sep 17 00:00:00 2001
From: Tony Day <zygomega@gmail.com>
Date: Fri, 12 Oct 2012 14:39:53 +1100
Subject: [PATCH] * org-insert-link: use ido when inserting links
org.el (org-insert-link): remove a list within the list of link
creation that causes a bug when using ido. Remove the hard coded
iswitch and ido switches.
(org-iread-file-name): create a function that can use
ido-read-file-name if flagged as ok.
(org-file-complete-link): reference org-iread-file-name.
---
lisp/org.el | 37 ++++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index bdfc919..89acb81 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9317,18 +9317,15 @@ Use TAB to complete link prefixes, then RET for type-specific completion support
(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 (lambda (x) (concat x ":"))
+ all-prefixes)
+ (mapcar 'car org-stored-links))
+ nil nil nil
+ 'tmphist
+ (caar org-stored-links)))
(if (not (string-match "\\S-" link))
(error "No link selected"))
(mapc (lambda(l)
@@ -9422,7 +9419,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 +9437,20 @@ Use TAB to complete link prefixes, then RET for type-specific completion support
(t (setq link (concat "file:" file)))))
link))
+(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)
--
1.7.9.6 (Apple Git-31.1)
next prev parent reply other threads:[~2012-10-13 4:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-12 3:58 [PATCH] * org-insert-link: use ido when inserting links tony day
2012-10-12 12:50 ` Nicolas Goaziou
2012-10-13 4:42 ` tony day [this message]
2012-10-13 10:35 ` Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=A3AD1C6C-5E86-42E2-976D-F65FF6F5075B@gmail.com \
--to=zygomega@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=n.goaziou@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).