* diff-apply-hunk uses smerge-refine-subst which is not defined
@ 2007-10-26 16:07 Sam Steingold
2007-10-26 16:31 ` Dan Nicolaescu
2007-10-26 18:46 ` Stefan Monnier
0 siblings, 2 replies; 6+ messages in thread
From: Sam Steingold @ 2007-10-26 16:07 UTC (permalink / raw)
To: emacs-devel
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: diff-apply-hunk uses smerge-refine-subst which is not defined
2007-10-26 16:07 diff-apply-hunk uses smerge-refine-subst which is not defined Sam Steingold
@ 2007-10-26 16:31 ` Dan Nicolaescu
2007-10-26 18:46 ` Stefan Monnier
1 sibling, 0 replies; 6+ messages in thread
From: Dan Nicolaescu @ 2007-10-26 16:31 UTC (permalink / raw)
To: emacs-devel
"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?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: diff-apply-hunk uses smerge-refine-subst which is not defined
2007-10-26 16:07 diff-apply-hunk uses smerge-refine-subst which is not defined Sam Steingold
2007-10-26 16:31 ` Dan Nicolaescu
@ 2007-10-26 18:46 ` Stefan Monnier
2007-10-26 21:12 ` martin rudalics
2007-10-26 21:23 ` martin rudalics
1 sibling, 2 replies; 6+ messages in thread
From: Stefan Monnier @ 2007-10-26 18:46 UTC (permalink / raw)
To: emacs-devel
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: diff-apply-hunk uses smerge-refine-subst which is not defined
2007-10-26 18:46 ` Stefan Monnier
@ 2007-10-26 21:12 ` martin rudalics
2007-10-26 21:23 ` martin rudalics
1 sibling, 0 replies; 6+ messages in thread
From: martin rudalics @ 2007-10-26 21:12 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
> `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'?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: diff-apply-hunk uses smerge-refine-subst which is not defined
2007-10-26 18:46 ` Stefan Monnier
2007-10-26 21:12 ` martin rudalics
@ 2007-10-26 21:23 ` martin rudalics
2007-10-26 21:44 ` Stefan Monnier
1 sibling, 1 reply; 6+ messages in thread
From: martin rudalics @ 2007-10-26 21:23 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
> `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'?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: diff-apply-hunk uses smerge-refine-subst which is not defined
2007-10-26 21:23 ` martin rudalics
@ 2007-10-26 21:44 ` Stefan Monnier
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Monnier @ 2007-10-26 21:44 UTC (permalink / raw)
To: martin rudalics; +Cc: emacs-devel
>> `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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-10-26 21:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-26 16:07 diff-apply-hunk uses smerge-refine-subst which is not defined Sam Steingold
2007-10-26 16:31 ` Dan Nicolaescu
2007-10-26 18:46 ` Stefan Monnier
2007-10-26 21:12 ` martin rudalics
2007-10-26 21:23 ` martin rudalics
2007-10-26 21:44 ` Stefan Monnier
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).