summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-07-15 20:52:48 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-07-15 20:52:48 +0200
commitb7fcfc64120f95ed16721b4c5cdc737b45c5b78c (patch)
tree6e4e1cbba80f9cd96373153cc2b7bc9ace156fcf
parent93e1f7c66f77827bcad7a5636c3edcff685ca19e (diff)
downloademacs-b7fcfc64120f95ed16721b4c5cdc737b45c5b78c.tar.gz
emacs-b7fcfc64120f95ed16721b4c5cdc737b45c5b78c.tar.bz2
emacs-b7fcfc64120f95ed16721b4c5cdc737b45c5b78c.zip
Fix INITIAL-INPUT cons handling in ido-read-internal
* lisp/ido.el (ido-read-internal): Is INITIAL-INPUT is a cons that specifies cursor position, adjust the number to be palatable for `read-for-minibuffer' (bug#27807).
-rw-r--r--lisp/ido.el9
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ido.el b/lisp/ido.el
index bf2c74558ac..e14f0151690 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1905,7 +1905,14 @@ If INITIAL is non-nil, it specifies the initial input string."
)
(ido-setup-completion-map)
- (setq ido-text-init initial)
+
+ (setq ido-text-init
+ (if (consp initial)
+ (cons (car initial)
+ ;; `completing-read' uses 0-based index while
+ ;; `read-from-minibuffer' uses 1-based index.
+ (1+ (cdr initial)))
+ initial))
(setq ido-input-stack nil)
(run-hooks 'ido-setup-hook)