ivy-completing-read sets wrong :caller

[basil-conto]

I think ce3c0ec introduced the following behaviour:

1. make plain

2. (defun foo ()
     (interactive)
     (setq unread-command-events '(?\C-m))
     (completing-read "Command: " obarray #'commandp t)
     (message ">>> %s" (ivy-state-caller ivy-last)))

3. C-j
4. M-xfooRET
   • Expected result: >>> foo in echo area.
   • Actual result: >>> nil in echo area.

What is the purpose of the (called-interactively-p 'any) guard in the aforementioned commit? In my tests it always returns nil. Can we do the following?

diff --git a/ivy.el b/ivy.el
index f8aceb2..d02a8b9 100644
--- a/ivy.el
+++ b/ivy.el
@@ -2067,7 +2067,9 @@ ivy-completing-read
                 :caller (cond ((called-interactively-p 'any)
                                this-command)
                               ((and collection (symbolp collection))
-                               collection))))))
+                               collection)
+                              (t
+                               this-command))))))
 
 (defun ivy-completing-read-with-empty-string-def
     (prompt collection

Is there a better solution?

[basil-conto]

This also relates to #1297.

[basil-conto]

#1621, which is a simpler version of #1297, fixes this issue, but my question about the use of (called-interactively-p 'any) still remains.

[abo-abo]

purpose of (called-interactively-p 'any)

I'm not sure anymore. I think this can be used to detect of we're running tests in emacs -batch mode or not.

I think changing the code to this should work:

(if (and collection (symbolp collection))
    collection
  this-command)

[basil-conto]

I think changing the code to this should work:

If you still think so (and I don't see anything wrong with the suggestion), would you like to make this change?

[abo-abo]

I've made the change. Thanks.