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

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

[Sam Steingold]

GNU Emacs 23.0.50.22 (x86_64-unknown-linux-gnu, GTK+ Version 2.8.20)
 of 2007-10-25 on nyc-qws-005
 '-with-gtk' '-with-gif=no'

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)

-- 
Sam Steingold (http://sds.podval.org/) on Fedora Core release 5 (Bordeaux)
http://pmw.org.il http://dhimmi.com http://iris.org.il http://mideasttruth.com
http://jihadwatch.org http://thereligionofpeace.com http://memri.org
Linux: Telling Microsoft where to go since 1991.

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

[Dan Nicolaescu]

"Sam Steingold" <ssteingold@janestcapital.com> writes:

  > GNU Emacs 23.0.50.22 (x86_64-unknown-linux-gnu, GTK+ Version 2.8.20)
  >  of 2007-10-25 on nyc-qws-005
  >  '-with-gtk' '-with-gif=no'
  > 
  > 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)

That is strange, as diff-refine-hunk starts with 
  (eval-and-compile (require 'smerge-mode))
and smerge-mode.el defines smerge-refine-subst. 

Are you sure that diff-mode.el and smerge-mode.el are up to date, and
they have been byte-compiled after the last update?

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

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

[martin rudalics]

> `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 ?

What is `diff-refine-hook'?

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

[martin rudalics]

> `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 ?

Sorry, mailed too soon.  ChangeLog 11 mentions a thing called
`diff-refine-hook'.  Should that be `diff-refine-hunk'?

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

[Stefan Monnier]

>> `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 ?

> Sorry, mailed too soon.  ChangeLog 11 mentions a thing called
> `diff-refine-hook'.  Should that be `diff-refine-hunk'?

Yes, that was a typo.


        Stefan