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: pcl-cvs misbehaving Date: Wed, 25 May 2005 18:45:40 -0400 Message-ID: <87vf57szim.fsf-monnier+emacs@gnu.org> References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1117063563 11951 80.91.229.2 (25 May 2005 23:26:03 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 25 May 2005 23:26:03 +0000 (UTC) Cc: Michael Kifer , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 26 01:26:00 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Db5Dl-0005vq-Rk for ged-emacs-devel@m.gmane.org; Thu, 26 May 2005 01:23:30 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Db5Hi-000628-De for ged-emacs-devel@m.gmane.org; Wed, 25 May 2005 19:27:34 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Db5Ds-0003wo-Dm for emacs-devel@gnu.org; Wed, 25 May 2005 19:23:36 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Db5Dr-0003vq-CF for emacs-devel@gnu.org; Wed, 25 May 2005 19:23:35 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Db5Au-0002uw-M0 for emacs-devel@gnu.org; Wed, 25 May 2005 19:20:33 -0400 Original-Received: from [209.226.175.25] (helo=tomts5-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.34) id 1Db4dg-0006HQ-6I for emacs-devel@gnu.org; Wed, 25 May 2005 18:46:12 -0400 Original-Received: from alfajor ([70.49.81.199]) by tomts5-srv.bellnexxia.net (InterMail vM.5.01.06.10 201-253-122-130-110-20040306) with ESMTP id <20050525224541.MQIG26128.tomts5-srv.bellnexxia.net@alfajor>; Wed, 25 May 2005 18:45:41 -0400 Original-Received: by alfajor (Postfix, from userid 1000) id DC25CD7700; Wed, 25 May 2005 18:45:40 -0400 (EDT) Original-To: David Abrahams In-Reply-To: (David Abrahams's message of "Wed, 25 May 2005 15:01:25 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) 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:37650 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:37650 > I see a file labelled "need-merge", so I do `d E' and get: `d E' doesn't "merge" changes, it helps resolve conflicts that appeared during an earlier merge. It's a common misunderstanding (i.e. a misfeature of PCL-CVS's UI) and at least the error message should be improved. > ediff-setup: Wrong number of arguments: (lambda (type) "A mode to do basic comment and font-lock functionality The problem is that ediff-setup does: (insert-buffer buf) (funcall (ediff-with-current-buffer buf major-mode)) (widen) ; merge buffer is always widened thus assuming that the function stored in `major-mode' can be called with no arguments. This should indeed be the case (see the elisp manual snippet I quoted earlier today in the context of org-mode and define-derived-mode). So I guess the error is in generic-x.el since it sets major-mode to `generic-mode' which is not a valid major mode function. Stefan