1

I sync my org files via Dropbox. Occasionally, Dropbox will bring in changes into a file whose buffer I've already modified. I can diff the buffer and the file on disk with diff-buffer-with-file; but then what?

Theoretically it's a diff minor mode file, so I should be able to use diff functions such as (diff-apply-hunk), but in practice a get an elisp stack trace.

What am I doing wrong? Is there a better approach?

Improve this question
2
  • Sounds like a bug. So I'd recommend M-x report-emacs-bug. Commented May 18, 2020 at 5:11
  • 2
    As a workaround (or not, as the case may be), see whether you have better success with the ediff variant, which is ediff-current-file. Commented May 18, 2020 at 6:00

0

Reset to default

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service and acknowledge you have read our privacy policy.

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.