emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Giovanni Ridolfi <giovanni.ridolfi@yahoo.it>
To: tony day <zygomega@gmail.com>,
	"emacs-orgmode@gnu.org" <emacs-orgmode@gnu.org>
Cc: Bastien <bzg@gnu.org>
Subject: Re: [PATCH] org-insert-link: allow ido usage when inserting links
Date: Fri, 14 Sep 2012 10:39:40 +0100 (BST)	[thread overview]
Message-ID: <1347615580.74656.YahooMailNeo@web29802.mail.ird.yahoo.com> (raw)
In-Reply-To: <5CE03302-7C87-44BE-B4AF-A6A92C96C803@gmail.com>

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 <zygomega@gmail.com>
A: emacs-orgmode@gnu.org
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

  reply	other threads:[~2012-09-14  9:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-14  9:21 [PATCH] org-insert-link: allow ido usage when inserting links tony day
2012-09-14  9:39 ` Giovanni Ridolfi [this message]
2012-09-22 16:17 ` Bastien
  -- strict thread matches above, loose matches on Subject: below --
2012-10-11  4:19 tony day
2012-10-11 12:23 ` Nicolas Goaziou
2012-10-12  3:56   ` tony day
2012-10-11 20:17 ` Samuel Wales

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=1347615580.74656.YahooMailNeo@web29802.mail.ird.yahoo.com \
    --to=giovanni.ridolfi@yahoo.it \
    --cc=bzg@gnu.org \
    --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).