ivy-read: Wrong type argument: symbolp, "Completion conflict history"

[dalanicolai]

The unquoted symbol emacs-conflict--conflict-history in the function emacs-conflict--pick-a-conflict causes errors in Spacemacs when using Helm or Ivy. Quoting the symbol solves the error when using Ivy, but not when using Helm. Removing the symbol fixes functionality for both Ivy and Helm.
As it appears that this symbol does not add functionality, it might be better to just remove it.

[kasteph]

I can confirm that this is also an issue in doom when using Ivy and with helm, I get the following:

In ‘emacs-conflict-resolve-conflicts History’ source: ‘#[0 \304\302\300\305\303$\211\205�\0\306\307\310\301�""\207 [nil nil Completion conflict history t helm-comp-read-get-candidates nil delete  helm-cr-default] 6]’ 
 (wrong-type-argument listp "Completion conflict history")

[felixwiemuth]

In Spacemacs with helm, I'm getting the same as @stephsamson. Removing the emacs-conflict--conflict-history in emacs-conflict--pick-a-conflict also works for me.

[ibizaman]

Thanks all for the report. I don’t have much time to fix this these days but I’ll get to it eventually. In the meantime I’m happy to accept a PR. :)

Actually I'm working on it and can reproduce.

[ibizaman]

I'm using ivy and the linked comment fixes the issue. Can anyone check it by checking out the branch?

The easiest way is changing the branch here:

(use-package emacs-conflict
  :straight (emacs-conflict :type git :host github :repo "ibizaman/emacs-conflict" :branch "fix_wrongtypeargument"))

Then you will need to evaluate the following elisp code to clear the variable:

(setq emacs-conflict--conflict-history nil)

[ibizaman]

I went on and merged the PR to avoid keeping this issue ope for too long. Feel free to reopen if there are issues with it.

[felixwiemuth]

Thank you! I updated to current the master (f4b8358) and the basic emacs-conflict-resolve-conflicts works now without problems.