From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Lennart Borgman (gmail)" Newsgroups: gmane.emacs.bugs,gmane.emacs.pretest.bugs Subject: bug#843: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Date: Sun, 31 Aug 2008 23:40:13 +0200 Message-ID: <48BB0FBD.4040209@gmail.com> References: <48BA9F45.2090908@gmail.com> <20080831153637.1103334a@kiferserv> Reply-To: "Lennart Borgman \(gmail\)" , 843@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1220220465 8488 80.91.229.12 (31 Aug 2008 22:07:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 31 Aug 2008 22:07:45 +0000 (UTC) Cc: emacs-pretest-bug@gnu.org To: kifer@cs.sunysb.edu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Sep 01 00:08:39 2008 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KZv66-0005sg-Si for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Sep 2008 00:08:39 +0200 Original-Received: from localhost ([127.0.0.1]:33668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KZv58-0007aC-2X for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Aug 2008 18:07:38 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KZv53-0007XH-Ij for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 18:07:33 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KZv52-0007Wx-VG for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 18:07:33 -0400 Original-Received: from [199.232.76.173] (port=38854 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KZv52-0007Wu-SS for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 18:07:32 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:47061) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KZv52-0007su-AC for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 18:07:32 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m7VM7UBc032319; Sun, 31 Aug 2008 15:07:30 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m7VLo2Fp025331; Sun, 31 Aug 2008 14:50:02 -0700 X-Loop: don@donarmstrong.com Resent-From: "Lennart Borgman (gmail)" Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Sun, 31 Aug 2008 21:50:02 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 843 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.122021882623244 (code B ref -1); Sun, 31 Aug 2008 21:50:02 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 31 Aug 2008 21:40:26 +0000 Original-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 m7VLeMCE023238 for ; Sun, 31 Aug 2008 14:40:23 -0700 Original-Received: from mail.gnu.org ([199.232.76.166]:52991 helo=mx10.gnu.org) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1KZudD-0005Mm-BV for emacs-pretest-bug@gnu.org; Sun, 31 Aug 2008 17:38:47 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1KZueg-0003uy-78 for emacs-pretest-bug@gnu.org; Sun, 31 Aug 2008 17:40:21 -0400 Original-Received: from ch-smtp02.sth.basefarm.net ([80.76.149.213]:40238) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KZuef-0003u4-MU for emacs-pretest-bug@gnu.org; Sun, 31 Aug 2008 17:40:18 -0400 Original-Received: from c83-254-151-87.bredband.comhem.se ([83.254.151.87]:62563 helo=[127.0.0.1]) by ch-smtp02.sth.basefarm.net with esmtp (Exim 4.68) (envelope-from ) id 1KZued-0005xe-7E; Sun, 31 Aug 2008 23:40:15 +0200 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 In-Reply-To: <20080831153637.1103334a@kiferserv> X-Enigmail-Version: 0.95.7 X-Antivirus: avast! (VPS 080831-0, 2008-08-31), Outbound message X-Antivirus-Status: Clean X-Originating-IP: 83.254.151.87 X-ACL-Warn: Too high rate of unknown addresses received from you X-Scan-Result: No virus found in message 1KZued-0005xe-7E. X-Scan-Signature: ch-smtp02.sth.basefarm.net 1KZued-0005xe-7E 7a21d800c862207c09a90ee28400d969 X-detected-kernel: by monty-python.gnu.org: Linux 2.6? (barebone, rare!) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Resent-Date: Sun, 31 Aug 2008 18:07:33 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:19942 gmane.emacs.pretest.bugs:22913 Archived-At: Michael Kifer wrote: > > On Sun, 31 Aug 2008 15:40:21 +0200 > "Lennart Borgman (gmail)" 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 # 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 # nil ("-c" >> "c:/DOCUME~1/LENNAR~1/LOCALS~1/Temp/ediff282470M" >> "c:/ecvsnew/bld/emacs/src/w32term.c")) >> ediff-exec-process("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' >> >> >