Re: diff-apply-hunk uses smerge-refine-subst which is not defined

[Stefan Monnier]

> Debugger entered--Lisp error: (void-function smerge-refine-subst)
>   smerge-refine-subst(1354 1781 1781 1884 ((diff-mode . fine) (face 
> diff-refine-change)) diff-refine-preproc)
>   diff-refine-hunk()
>   #[nil "À ‡" [diff-refine-hunk] 1]()
>   diff-hunk-next()
>   diff-apply-hunk(nil)
>   call-interactively(diff-apply-hunk)

`diff-refine-hunk' supposedly does a (require 'smerge-mode) which should
define this function.  Can you check that (featurep 'smerge-mode) is non-nil
and if so, can you take a look at M-x list-load-path-shadows RET ?


        Stefan