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

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (Emacs bug Tracking System)
To: "Lennart Borgman (gmail)" <lennart.borgman <at> gmail.com>
Subject: bug#837 closed by Chong Yidong <cyd <at> stupidchicken.com> (Re: 
 23.0.60; ediff-merge-revision: Buffer exceeds maximum size)

[Message part 1 (text/plain, inline)]

This is an automatic notification regarding your bug report
which was filed against the emacs package:

#844: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size

It has been closed by Chong Yidong <cyd <at> stupidchicken.com>.

Their explanation is attached below along with your original report.
If this explanation is unsatisfactory and you have not received a
better one in a separate message then please contact Chong Yidong <cyd <at> stupidchicken.com> by
replying to this email.


-- 
844: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=844
Emacs Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Chong Yidong <cyd <at> stupidchicken.com>
To: "Lennart Borgman \(gmail\)" <lennart.borgman <at> gmail.com>
Cc: 844-done <at> debbugs.gnu.org
Subject: Re: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size
Date: Tue, 02 Sep 2008 20:19:27 -0400

Are you able to reproduce this?

[Message part 3 (message/rfc822, inline)]

From: "Lennart Borgman (gmail)" <lennart.borgman <at> gmail.com>
To: emacs-pretest-bug <at> gnu.org, Michael Kifer <kifer <at> cs.sunysb.edu>
Subject: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size
Date: Sun, 31 Aug 2008 15:40:21 +0200

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'

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.