|
From: | Stefan Monnier |
Subject: | bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict |
Date: | Mon, 18 Feb 2019 16:51:05 -0500 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
> 1. On the first call of the function I get "smerge-vc-next-conflict: > Symbol’s function definition is void: vc-find-conflicted-file". This starts > working once I execute (require 'vc) Did you take only smerge-mode.el ? I changed vc.el so vc-find-conflicted-file is now autoloaded in the `master` branch, so you'll only see it if you use the `master` branch. > 2. Although I didn't set smerge-change-buffer-confirm to nil, there's no > confirmation before going to another buffer. I assume it's because you run it via `M-x`. The confirmation only kicks in if you run it via a keybinding. Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |