ffip-read-file-name-hijacked-p isn't reset on quit, causes ivy to be used for the rest of the session

[cpitclaudel]

(Thanks for this package; I'm not currently a user, but elpy, which I use, pulls it)

I just typed ffip-diff-apply-hunk by mistake, and the hunk didn't apply. This caused ffip-read-file-name-hijacked-p to not be set to nil, and all subsequent read-file-name calls to use ivy (this was doubly confusing, because I've never use ivy either).

That variable should be reset in all cases; ideally, the advice itself should be removed after the function completes.

Thanks!

[redguardtoo]

This command should be run only in ffip-diff-mode.

[cpitclaudel]

This command should be run only in ffip-diff-mode.

Sure, but why is it relevant to this issue?

[redguardtoo]

9b7216f ffip-diff-apply-hunk only run in diff-mode (Chen Bin)

[cpitclaudel]

This still looks wrong:

• Open a diff file; change to ffip-diff-mode
• Run M-x ffip-diff-apply-hunk on a hunk that doesn't apply.

At this point the advice added on read-file-name is still active (ffip-read-file-name-hijacked-p is not set to nil).

[redguardtoo]

feec108 fixed major-mode issue (Chen Bin)