From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: diff-apply-hunk uses smerge-refine-subst which is not defined Date: Fri, 26 Oct 2007 14:46:56 -0400 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1193424436 15330 80.91.229.12 (26 Oct 2007 18:47:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 26 Oct 2007 18:47:16 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 26 20:47:18 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IlUD9-0005Mo-2W for ged-emacs-devel@m.gmane.org; Fri, 26 Oct 2007 20:47:11 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IlUD0-0006UI-BJ for ged-emacs-devel@m.gmane.org; Fri, 26 Oct 2007 14:47:02 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IlUCx-0006T8-F9 for emacs-devel@gnu.org; Fri, 26 Oct 2007 14:46:59 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IlUCw-0006SV-DP for emacs-devel@gnu.org; Fri, 26 Oct 2007 14:46:58 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IlUCw-0006SN-8J for emacs-devel@gnu.org; Fri, 26 Oct 2007 14:46:58 -0400 Original-Received: from vpn-132-204-232-28.acd.umontreal.ca ([132.204.232.28] helo=ceviche.home) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IlUCv-0005Ye-QZ for emacs-devel@gnu.org; Fri, 26 Oct 2007 14:46:57 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 83FE7B4AB3; Fri, 26 Oct 2007 14:46:56 -0400 (EDT) In-Reply-To: (Sam Steingold's message of "Fri\, 26 Oct 2007 12\:07\:03 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/23.0.50 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:81783 Archived-At: > 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 "=C3=80 =C2=87" [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