|
@@ -7803,24 +7803,25 @@ from."
|
|
|
(iswitchb-read-buffer prompt)))
|
|
|
|
|
|
(defun org-icompleting-read (&rest args)
|
|
|
- "Completing-read using `ido-mode' or `iswitchb' speedups if available"
|
|
|
- (if (and org-completion-use-ido
|
|
|
- (fboundp 'ido-completing-read)
|
|
|
- (boundp 'ido-mode) ido-mode
|
|
|
- (listp (second args)))
|
|
|
- (let ((ido-enter-matching-directory nil))
|
|
|
- (apply 'ido-completing-read (concat (car args))
|
|
|
- (if (consp (car (nth 1 args)))
|
|
|
- (mapcar (lambda (x) (car x)) (nth 1 args))
|
|
|
- (nth 1 args))
|
|
|
- (cddr args)))
|
|
|
- (if (and org-completion-use-iswitchb
|
|
|
- (boundp 'iswitchb-mode) iswitchb-mode
|
|
|
- (listp (second args)))
|
|
|
- (apply 'org-iswitchb-completing-read (concat (car args))
|
|
|
- (mapcar (lambda (x) (car x)) (nth 1 args))
|
|
|
- (cddr args))
|
|
|
- (apply 'completing-read args))))
|
|
|
+ "Completing-read using `ido-mode' or `iswitchb' speedups if available."
|
|
|
+ (org-without-partial-completion
|
|
|
+ (if (and org-completion-use-ido
|
|
|
+ (fboundp 'ido-completing-read)
|
|
|
+ (boundp 'ido-mode) ido-mode
|
|
|
+ (listp (second args)))
|
|
|
+ (let ((ido-enter-matching-directory nil))
|
|
|
+ (apply 'ido-completing-read (concat (car args))
|
|
|
+ (if (consp (car (nth 1 args)))
|
|
|
+ (mapcar (lambda (x) (car x)) (nth 1 args))
|
|
|
+ (nth 1 args))
|
|
|
+ (cddr args)))
|
|
|
+ (if (and org-completion-use-iswitchb
|
|
|
+ (boundp 'iswitchb-mode) iswitchb-mode
|
|
|
+ (listp (second args)))
|
|
|
+ (apply 'org-iswitchb-completing-read (concat (car args))
|
|
|
+ (mapcar (lambda (x) (car x)) (nth 1 args))
|
|
|
+ (cddr args))
|
|
|
+ (apply 'completing-read args)))))
|
|
|
|
|
|
(defun org-extract-attributes (s)
|
|
|
"Extract the attributes cookie from a string and set as text property."
|