From: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Michael Kifer <kifer@cs.stonybrook.edu>, emacs-devel@gnu.org
Subject: Re: pcl-cvs misbehaving
Date: Wed, 25 May 2005 18:45:40 -0400 [thread overview]
Message-ID: <87vf57szim.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <uoeazuo3e.fsf@boost-consulting.com> (David Abrahams's message of "Wed, 25 May 2005 15:01:25 -0400")
> 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
next prev parent reply other threads:[~2005-05-25 22:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-25 19:01 pcl-cvs misbehaving David Abrahams
2005-05-25 22:45 ` Stefan Monnier [this message]
2005-05-26 0:43 ` David Abrahams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87vf57szim.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=kifer@cs.stonybrook.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).