forked from mirrors/org-mode
fixup! Obsolete `org-icompleting-read' and `org-completing-read-no-i'
* lisp/ol.el (org-insert-link): * lisp/org-ctags.el (org-ctags-find-tag-interactive): * lisp/ox-odt.el (org-odt-convert-read-params): Remove the remaining uses and references to ido-mode. Rely upon built-in Emacs completion system using the necessary completion backend rather than directly calling ido functions. This commit removes leftovers after https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=fdbf441560 Reported-by: Martin Marshall <law@martinmarshall.com>
This commit is contained in:
parent
5be39ff798
commit
01a074d0b5
|
@ -1914,9 +1914,8 @@ non-interactively, don't allow to edit the default description."
|
|||
(mapcar (lambda (x) (concat x ":")) all-prefixes)
|
||||
(mapcar #'car org-stored-links)
|
||||
;; Allow description completion. Avoid "nil" option
|
||||
;; in the case of `completing-read-default' and
|
||||
;; an error in `ido-completing-read' when some links
|
||||
;; have no description.
|
||||
;; in the case of `completing-read-default' when
|
||||
;; some links have no description.
|
||||
(delq nil (mapcar 'cadr org-stored-links)))
|
||||
nil nil nil
|
||||
'org-link--history
|
||||
|
|
|
@ -506,12 +506,11 @@ its subdirectories contain large numbers of taggable files."
|
|||
|
||||
(defun org-ctags-find-tag-interactive ()
|
||||
"Prompt for the name of a tag, with autocompletion, then visit the named tag.
|
||||
Uses `ido-mode' if available.
|
||||
If the user enters a string that does not match an existing tag, create
|
||||
a new topic."
|
||||
(interactive)
|
||||
(let* ((tag (ido-completing-read "Topic: " org-ctags-tag-list
|
||||
nil 'confirm nil 'org-ctags-find-tag-history)))
|
||||
(let* ((tag (completing-read "Topic: " org-ctags-tag-list
|
||||
nil 'confirm nil 'org-ctags-find-tag-history)))
|
||||
(when tag
|
||||
(cond
|
||||
((member tag org-ctags-tag-list)
|
||||
|
|
|
@ -4322,15 +4322,15 @@ The list of the form (OUTPUT-FMT-1 OUTPUT-FMT-2 ...)."
|
|||
(defun org-odt-convert-read-params ()
|
||||
"Return IN-FILE and OUT-FMT params for `org-odt-do-convert'.
|
||||
This is a helper routine for interactive use."
|
||||
(let* ((input (if (featurep 'ido) 'ido-completing-read 'completing-read))
|
||||
(in-file (read-file-name "File to be converted: "
|
||||
(let* ((in-file (read-file-name "File to be converted: "
|
||||
nil buffer-file-name t))
|
||||
(in-fmt (file-name-extension in-file))
|
||||
(out-fmt-choices (org-odt-reachable-formats in-fmt))
|
||||
(out-fmt
|
||||
(or (and out-fmt-choices
|
||||
(funcall input "Output format: "
|
||||
out-fmt-choices nil nil nil))
|
||||
(completing-read
|
||||
"Output format: "
|
||||
out-fmt-choices nil nil nil))
|
||||
(error
|
||||
"No known converter or no known output formats for %s files"
|
||||
in-fmt))))
|
||||
|
|
Loading…
Reference in New Issue