From: Nicolas Goaziou <n.goaziou@gmail.com>
To: tony day <zygomega@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] * org-insert-link: use ido when inserting links
Date: Fri, 12 Oct 2012 14:50:08 +0200 [thread overview]
Message-ID: <87a9vr3ldr.fsf@gmail.com> (raw)
In-Reply-To: <04D0E787-A8A1-4246-8DD2-D607E38D61BA@gmail.com> (tony day's message of "Fri, 12 Oct 2012 14:58:29 +1100")
Hello,
Thanks for considering my suggestions. So here are new ones:
tony day <zygomega@gmail.com> writes:
> org.el (org-insert-link): removed a list within the list of link
> creation that was causing a bug when using ido.
Nitpick: "Removed a list...".
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?
> Removed the hard coded iswitch and ido switches.
Just wondering: what will happen if an user wants to use iswitchb?
> 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.
> (org-iread-file-name): created a function that can use
> ido-read-file-name if flagged as ok.
Nitpick: "Created..."
> (org-file-complete-link): referenced org-iread-file-name.
Nitpick: "Referenced..."
> ---
> 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)))
For now, you can remove that part, unless it is tied to the current
patch. But having http first doesn't sound convincing.
> (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)
Why do you need to change that order?
> + (mapcar 'car org-stored-links))
> + nil nil nil
> + 'tmphist
> + (cadr org-stored-links)))
It means the default value will be the second stored link, if any? Is it intended?
> (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))
>
> +(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)
It looks good.
You can answer to this mail, no need to post the patch on another
thread.
Regards,
--
Nicolas Goaziou
next prev parent reply other threads:[~2012-10-12 12:53 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 [this message]
2012-10-13 4:42 ` tony day
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=87a9vr3ldr.fsf@gmail.com \
--to=n.goaziou@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=zygomega@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).