From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: don@donarmstrong.com (Emacs bug Tracking System) Newsgroups: gmane.emacs.bugs Subject: bug#837: marked as done (23.0.60; ediff-merge-revision: Buffer exceeds maximum size) Date: Tue, 2 Sep 2008 17:25:07 -0700 Message-ID: References: <871w026pyo.fsf@cyd.mit.edu> <48BA9F45.2090908@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----------=_1220401507-1618-2" X-Trace: ger.gmane.org 1220401739 17608 80.91.229.12 (3 Sep 2008 00:28:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 3 Sep 2008 00:28:59 +0000 (UTC) To: Chong Yidong Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Sep 03 02:29:53 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 1KagFq-0003G0-Kw for geb-bug-gnu-emacs@m.gmane.org; Wed, 03 Sep 2008 02:29:51 +0200 Original-Received: from localhost ([127.0.0.1]:50759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KagEr-00048f-FI for geb-bug-gnu-emacs@m.gmane.org; Tue, 02 Sep 2008 20:28:49 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KagDk-0003EY-Rl for bug-gnu-emacs@gnu.org; Tue, 02 Sep 2008 20:27:40 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KagDg-0003Ah-3h for bug-gnu-emacs@gnu.org; Tue, 02 Sep 2008 20:27:39 -0400 Original-Received: from [199.232.76.173] (port=48153 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KagDf-0003AK-73 for bug-gnu-emacs@gnu.org; Tue, 02 Sep 2008 20:27:35 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:56519) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KagDe-0001s7-7Q for bug-gnu-emacs@gnu.org; Tue, 02 Sep 2008 20:27:34 -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 m830RU7b002893; Tue, 2 Sep 2008 17:27:31 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m830P7uA001715; Tue, 2 Sep 2008 17:25:07 -0700 X-Mailer: MIME-tools 5.420 (Entity 5.420) X-Loop: don@donarmstrong.com X-Emacs-PR-Message: closed 837 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: unreproducible X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) 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:20069 Archived-At: This is a multi-part message in MIME format... ------------=_1220401507-1618-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Your message dated Tue, 02 Sep 2008 20:19:27 -0400 with message-id <871w026pyo.fsf@cyd.mit.edu> and subject line Re: 23.0.60; ediff-merge-revision: Buffer exceeds maximum = size has caused the Emacs bug report #844, regarding 23.0.60; ediff-merge-revision: Buffer exceeds maximum size to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact don@donarmstrong.com immediately.) --=20 844: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=3D844 Emacs Bug Tracking System Contact don@donarmstrong.com with problems ------------=_1220401507-1618-2 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 ; 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 ) id 1KZn8z-0001PY-O2 for emacs-pretest-bug@gnu.org; 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 ) id 1KZnAS-0006YO-Q9 for emacs-pretest-bug@gnu.org; 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 ) id 1KZnAS-0006Xg-2l for emacs-pretest-bug@gnu.org; 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 ) id 1KZnAO-0006FD-9K; Sun, 31 Aug 2008 15:40:33 +0200 Message-ID: <48BA9F45.2090908@gmail.com> Date: Sun, 31 Aug 2008 15:40:21 +0200 From: "Lennart Borgman (gmail)" 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@gnu.org, Michael Kifer 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 # 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' ------------=_1220401507-1618-2 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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=-3.8 required=4.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 844-done) by emacsbugs.donarmstrong.com; 3 Sep 2008 00:17:07 +0000 Received: from cyd.mit.edu (CYD.MIT.EDU [18.115.2.24]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m830H4a0031913 for <844-done@emacsbugs.donarmstrong.com>; Tue, 2 Sep 2008 17:17:06 -0700 Received: by cyd.mit.edu (Postfix, from userid 1000) id 80D5257E339; Tue, 2 Sep 2008 20:19:27 -0400 (EDT) To: "Lennart Borgman \(gmail\)" Cc: 844-done@emacsbugs.donarmstrong.com Subject: Re: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size From: Chong Yidong Date: Tue, 02 Sep 2008 20:19:27 -0400 Message-ID: <871w026pyo.fsf@cyd.mit.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Are you able to reproduce this? ------------=_1220401507-1618-2--