From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: diff-apply-hunk uses smerge-refine-subst which is not defined Date: Fri, 26 Oct 2007 09:31:09 -0700 Message-ID: <200710261631.l9QGV94u003682@oogie-boogie.ics.uci.edu> 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 1193416435 14399 80.91.229.12 (26 Oct 2007 16:33:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 26 Oct 2007 16:33:55 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 26 18:33:56 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 1IlS85-000660-KO for ged-emacs-devel@m.gmane.org; Fri, 26 Oct 2007 18:33:49 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IlS7x-00046X-4V for ged-emacs-devel@m.gmane.org; Fri, 26 Oct 2007 12:33:41 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IlS7t-00045x-Si for emacs-devel@gnu.org; Fri, 26 Oct 2007 12:33:37 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IlS7s-00045l-Hx for emacs-devel@gnu.org; Fri, 26 Oct 2007 12:33:37 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IlS7s-00045f-BX for emacs-devel@gnu.org; Fri, 26 Oct 2007 12:33:36 -0400 Original-Received: from oogie-boogie.ics.uci.edu ([128.195.1.41]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IlS7r-00081Z-45 for emacs-devel@gnu.org; Fri, 26 Oct 2007 12:33:35 -0400 Original-Received: from mothra.ics.uci.edu (mothra.ics.uci.edu [128.195.6.93]) by oogie-boogie.ics.uci.edu (8.13.6/8.13.6) with ESMTP id l9QGV94u003682 for ; Fri, 26 Oct 2007 09:31:10 -0700 (PDT) In-Reply-To: (Sam Steingold's message of "Fri\, 26 Oct 2007 12\:07\:03 -0400") Original-Lines: 20 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.363, required 5, autolearn=disabled, ALL_TRUSTED -1.44, TW_QW 0.08) X-ICS-MailScanner-From: dann@mothra.ics.uci.edu X-detected-kernel: by monty-python.gnu.org: Solaris 9 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:81778 Archived-At: "Sam Steingold" 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=3Dno' >=20 > Debugger entered--Lisp error: (void-function smerge-refine-subst) > smerge-refine-subst(1354 1781 1781 1884 ((diff-mode . fine) (face dif= f-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) That is strange, as diff-refine-hunk starts with=20 (eval-and-compile (require 'smerge-mode)) and smerge-mode.el defines smerge-refine-subst.=20 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?