From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Abrahams Newsgroups: gmane.emacs.devel Subject: Re: pcl-cvs misbehaving Date: Wed, 25 May 2005 20:43:11 -0400 Message-ID: References: <87vf57szim.fsf-monnier+emacs@gnu.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1117068324 22140 80.91.229.2 (26 May 2005 00:45:24 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 26 May 2005 00:45:24 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 26 02:45:16 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Db6UX-0005bb-Ga for ged-emacs-devel@m.gmane.org; Thu, 26 May 2005 02:44:53 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Db6YV-0001w6-4B for ged-emacs-devel@m.gmane.org; Wed, 25 May 2005 20:48:59 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Db6X6-0001nc-O5 for emacs-devel@gnu.org; Wed, 25 May 2005 20:47:33 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Db6X4-0001l8-2M for emacs-devel@gnu.org; Wed, 25 May 2005 20:47:30 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Db6X3-0001k6-Lr for emacs-devel@gnu.org; Wed, 25 May 2005 20:47:29 -0400 Original-Received: from [80.91.229.2] (helo=ciao.gmane.org) by monty-python.gnu.org with esmtp (TLS-1.0:RSA_AES_128_CBC_SHA:16) (Exim 4.34) id 1Db6Um-0001iy-AK for emacs-devel@gnu.org; Wed, 25 May 2005 20:45:08 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1Db6S1-0005NL-TP for emacs-devel@gnu.org; Thu, 26 May 2005 02:42:17 +0200 Original-Received: from 146-115-127-135.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com ([146.115.127.135]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 May 2005 02:42:17 +0200 Original-Received: from dave by 146-115-127-135.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 26 May 2005 02:42:17 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-To: emacs-devel@gnu.org Original-Lines: 37 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: 146-115-127-135.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (windows-nt) Cancel-Lock: sha1:lDE9QL9001jLeRmqnzyKvjTH/Ok= 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:37657 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:37657 Stefan Monnier writes: >> 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. Right, I knew that, but I used it anyway. > It's a common misunderstanding (i.e. a misfeature of PCL-CVS's UI) > and at least the error message should be improved. I guess. It would help a lot if the hint when you hit `d' were changed so that instead of "imerge" it said "resolve conflicts" or "review/resolve merge" >> 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. So, do I need to do something to report that, or are you following up, or...? -- Dave Abrahams Boost Consulting www.boost-consulting.com