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

Previous Next

Package: emacs;

Reported by: kifer <at> cs.sunysb.edu

Date: Sun, 31 Aug 2008 22:50:03 UTC

Severity: normal

Tags: moreinfo, unreproducible

Merged with 837, 841, 843, 2706

Done: Lars Ingebrigtsen <larsi <at> gnus.org>

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#843 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: kifer <at> cs.sunysb.edu
Cc: emacs-pretest-bug <at> gnu.org
Subject: Re: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size
Date: Sun, 31 Aug 2008 23:40:13 +0200
Michael Kifer wrote:
> 
> On Sun, 31 Aug 2008 15:40:21 +0200
> "Lennart Borgman (gmail)" <lennart.borgman <at> gmail.com> wrote:
> 
>> 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"
> 
> This says that the output of diff -c exceeds the buffer size.
> 
> It is unclear how this is related to ediff per se, since ediff merely calls
> call-process with the above command.
> 
>> "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:
> 
> Can you explain what the problem is? It is unclear from the included text below.

Sorry, I thought the part of the output below should show it, but of
course the ^M characters I saw is gone here...

Lines somewhere below the middle of the output below had extra ^M at the
end of them.

I can't reproduce the problem now, maybe it was some kind of temporary
problem - perhaps a bad checkin to the CVS at that time?

> In any case, I deed to be able to reproduce it in order to be able to determine
> if something needs to be fixed in ediff. Right now it does not look like
> an ediff problem.
> 
> michael
> 
> 
>> ! 	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'
>>
>>
> 



This bug report was last modified 9 years and 173 days ago.

Previous Next


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