GNU bug report logs - #837
23.0.60; ediff-merge-revision: Buffer exceeds maximum size

Message received at (unknown):

Received: (at unknown) by unknown; unknown
X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02
	(2007-08-08) on rzlab.ucr.edu
X-Spam-Level: 
X-Spam-Status: No, score=-7.2 required=4.0 tests=AWL,BAYES_00,FOURLA,
	MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED autolearn=ham
	version=3.2.3-bugs.debian.org_2005_01_02
Received: (at submit) by emacsbugs.donarmstrong.com; 31 Aug 2008 13:40:44 +0000
Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10])
	by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m7VDeexn022412
	for <submit@HIDDEN>; Sun, 31 Aug 2008 06:40:41 -0700
Received: from mail.gnu.org ([199.232.76.166]:54533 helo=mx10.gnu.org)
	by fencepost.gnu.org with esmtp (Exim 4.67)
	(envelope-from <lennart.borgman@HIDDEN>)
	id 1KZn8z-0001PY-O2
	for emacs-pretest-bug@HIDDEN; Sun, 31 Aug 2008 09:39:05 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60)
	(envelope-from <lennart.borgman@HIDDEN>)
	id 1KZnAS-0006YO-Q9
	for emacs-pretest-bug@HIDDEN; Sun, 31 Aug 2008 09:40:39 -0400
Received: from ch-smtp02.sth.basefarm.net ([80.76.149.213]:48006)
	by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60)
	(envelope-from <lennart.borgman@HIDDEN>)
	id 1KZnAS-0006Xg-2l
	for emacs-pretest-bug@HIDDEN; Sun, 31 Aug 2008 09:40:36 -0400
Received: from c83-254-151-87.bredband.comhem.se ([83.254.151.87]:60701 helo=[127.0.0.1])
	by ch-smtp02.sth.basefarm.net with esmtp (Exim 4.68)
	(envelope-from <lennart.borgman@HIDDEN>)
	id 1KZnAO-0006FD-9K; Sun, 31 Aug 2008 15:40:33 +0200
Message-ID: <48BA9F45.2090908@HIDDEN>
Date: Sun, 31 Aug 2008 15:40:21 +0200
From: "Lennart Borgman (gmail)" <lennart.borgman@HIDDEN>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.9) Gecko/20071031 Thunderbird/2.0.0.9 Mnenhy/0.7.5.666
MIME-Version: 1.0
To: emacs-pretest-bug@HIDDEN, Michael Kifer <kifer@HIDDEN>
Subject: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size
X-Enigmail-Version: 0.95.7
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Antivirus: avast! (VPS 080830-0, 2008-08-30), Outbound message
X-Antivirus-Status: Clean
X-Originating-IP: 83.254.151.87
X-Scan-Result: No virus found in message 1KZnAO-0006FD-9K.
X-Scan-Signature: ch-smtp02.sth.basefarm.net 1KZnAO-0006FD-9K b9a5d6d79e133382d1aa89ec641bb200
X-detected-kernel: by monty-python.gnu.org: Linux 2.6? (barebone, rare!)

When I just made a checkout of Emacs from CVS I got a merge conflict
which I used ediff-revision to resolve. I then got the following back
trace when I did "wb" to save the corrected file:

Debugger entered--Lisp error: (error "Buffer exceeds maximum size")
  call-process("diff" nil #<buffer *ediff-custom-diff*> nil "-c"
"c:/DOCUME~1/LENNAR~1/LOCALS~1/Temp/ediff282470M"
"c:/ecvsnew/bld/emacs/src/w32term.c")
  apply(call-process "diff" nil #<buffer *ediff-custom-diff*> nil ("-c"
"c:/DOCUME~1/LENNAR~1/LOCALS~1/Temp/ediff282470M"
"c:/ecvsnew/bld/emacs/src/w32term.c"))
  ediff-exec-process("diff" #<buffer *ediff-custom-diff*> synchronize
"-c" "c:/DOCUME~1/LENNAR~1/LOCALS~1/Temp/ediff282470M"
"c:/ecvsnew/bld/emacs/src/w32term.c")
  ediff-compute-custom-diffs-maybe()
  ediff-save-buffer(nil)
  call-interactively(ediff-save-buffer nil nil)

Looking into ediff-custom-diff I can see there is some problem with ^M:

! 	emacs_event->part = scroll_bar_handle;
! 	y = 0;
! 	break;
        case SB_BOTTOM:
! 	emacs_event->part = scroll_bar_handle;
! 	y = top_range;
! 	break;
        case SB_THUMBTRACK:
        case SB_THUMBPOSITION:
! 	if (VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height)) <= 0xffff)
            y = HIWORD (msg->msg.wParam);

! 	bar->dragging = Qt;

! 	emacs_event->part = scroll_bar_handle;



! 	/* "Silently" update current position.  */

! 	{

! 	  SCROLLINFO si;




This was with my patched version, but I do not think I have any patches
that comes in here:

In GNU Emacs 23.0.60.1 (i386-mingw-nt5.1.2600)
 of 2008-08-28 (patched)
Windowing system distributor `Microsoft Corp.', version 5.1.2600
configured using `configure --with-gcc (3.4) --cflags -Ic:/g/include'