From ce4e647c213e6884a3a00fcde4c949c7295cdef0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 22 Apr 2015 14:30:59 +0200 Subject: [PATCH] Tiny refactoring * lisp/org.el (org-iread-file-name): Refactor. `read-file-name' already applies `read-file-name-function' when available. --- lisp/org.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 50de016e0..7165c9fb9 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -10467,11 +10467,11 @@ 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))) + (org-bound-and-true-p ido-mode) + (listp (nth 1 args))) (let ((ido-enter-matching-directory nil)) - (apply 'ido-read-file-name args)) - (apply (or read-file-name-function 'read-file-name) args)))) + (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." -- 2.11.4.GIT