Giter Club home page Giter Club logo

Comments (6)

kasteph avatar kasteph commented on June 19, 2024 1

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

from emacs-conflict.

felixwiemuth avatar felixwiemuth commented on June 19, 2024 1

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

from emacs-conflict.

felixwiemuth avatar felixwiemuth commented on June 19, 2024

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.

from emacs-conflict.

ibizaman avatar ibizaman commented on June 19, 2024

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.

from emacs-conflict.

ibizaman avatar ibizaman commented on June 19, 2024

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)

from emacs-conflict.

ibizaman avatar ibizaman commented on June 19, 2024

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.

from emacs-conflict.

Related Issues (3)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.