From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 15 Jul 2019 18:52:48 +0000 (+0200)
Subject: Fix INITIAL-INPUT cons handling in ido-read-internal
X-Git-Tag: emacs-27.0.90~1888
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b7fcfc64120f95ed16721b4c5cdc737b45c5b78c;p=emacs.git

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).
---

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)