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#837: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Date: Sun, 31 Aug 2008 15:40:21 +0200 Message-ID: <48BA9F45.2090908@gmail.com> Reply-To: "Lennart Borgman \(gmail\)" , 837@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 1220191685 15858 80.91.229.12 (31 Aug 2008 14:08:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 31 Aug 2008 14:08:05 +0000 (UTC) To: emacs-pretest-bug@gnu.org, Michael Kifer Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Aug 31 16:08:59 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 1KZnbu-0002z2-VL for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Aug 2008 16:08:59 +0200 Original-Received: from localhost ([127.0.0.1]:54750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KZnav-0004bk-J5 for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Aug 2008 10:07:57 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KZnaY-0004IE-VS for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 10:07:35 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KZnaX-0004HP-Nk for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 10:07:34 -0400 Original-Received: from [199.232.76.173] (port=57895 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KZnaX-0004HH-IV for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 10:07:33 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:39429) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KZnaW-0008Dc-Ml for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 10:07:33 -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 m7VE7UgL031727; Sun, 31 Aug 2008 07:07:30 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m7VDo4Ut024608; Sun, 31 Aug 2008 06:50:04 -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 13:50:04 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 837 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.122019004422418 (code B ref -1); Sun, 31 Aug 2008 13:50:04 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 31 Aug 2008 13:40:44 +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 m7VDeexn022412 for ; Sun, 31 Aug 2008 06:40:41 -0700 Original-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 ) id 1KZn8z-0001PY-O2 for emacs-pretest-bug@gnu.org; Sun, 31 Aug 2008 09:39:05 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1KZnAS-0006YO-Q9 for emacs-pretest-bug@gnu.org; Sun, 31 Aug 2008 09:40:39 -0400 Original-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 ) id 1KZnAS-0006Xg-2l for emacs-pretest-bug@gnu.org; Sun, 31 Aug 2008 09:40:36 -0400 Original-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 ) id 1KZnAO-0006FD-9K; Sun, 31 Aug 2008 15:40:33 +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 X-Enigmail-Version: 0.95.7 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!) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Resent-Date: Sun, 31 Aug 2008 10:07:34 -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:19933 gmane.emacs.pretest.bugs:22910 Archived-At: 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" "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: ! 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'