|
From: | Juri Linkov |
Subject: | bug#32991: 27.0.50; diff-auto-refine-mode a no-op |
Date: | Wed, 30 Jan 2019 23:04:22 +0200 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) |
>> ;; Define smerge-next and smerge-prev >> (easy-mmode-define-navigation smerge smerge-begin-re "conflict" nil nil >> - (if diff-auto-refine-mode >> + (if (eq diff-refine 'navigation) >> (condition-case nil (smerge-refine) (error nil)))) > > Hmm... I want to set my `diff-refined` to `font-lock` yet I also want my > smerge conflicts to be refined when I navigate to them. > Maybe the test here should be just whether diff-refine is non-nil? A similar option `font-lock` also makes sense for a new customizable variable with a name like `smerge-refine` that could automatically refine all smerge conflicts. The problem is that it's difficult to remember and type such key sequences `C-c ^ n` (smerge-next) and `C-c ^ R` (smerge-refine) It would be easier if smerge-mode refined all them automatically.
[Prev in Thread] | Current Thread | [Next in Thread] |