From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Kifer Newsgroups: gmane.emacs.bugs,gmane.emacs.pretest.bugs Subject: bug#841: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Date: Sun, 31 Aug 2008 15:36:37 -0400 Organization: Stony Brook University Message-ID: <20080831153637.1103334a@kiferserv> References: <48BA9F45.2090908@gmail.com> Reply-To: kifer@cs.sunysb.edu, 841@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1220212067 16333 80.91.229.12 (31 Aug 2008 19:47:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 31 Aug 2008 19:47:47 +0000 (UTC) Cc: emacs-pretest-bug@gnu.org To: "Lennart Borgman (gmail)" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Aug 31 21:48:41 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 1KZsuc-00085Z-Vr for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Aug 2008 21:48:39 +0200 Original-Received: from localhost ([127.0.0.1]:47365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KZste-000496-7F for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Aug 2008 15:47:38 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KZstb-000491-9y for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 15:47:35 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KZstY-00048P-Ss for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 15:47:34 -0400 Original-Received: from [199.232.76.173] (port=41596 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KZstY-00048L-L7 for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 15:47:32 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:35098) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KZstY-00087c-8E for bug-gnu-emacs@gnu.org; Sun, 31 Aug 2008 15:47: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 m7VJlUr1016833; Sun, 31 Aug 2008 12:47:30 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m7VJj3WT015519; Sun, 31 Aug 2008 12:45:03 -0700 X-Loop: don@donarmstrong.com Resent-From: Michael Kifer Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Sun, 31 Aug 2008 19:45:03 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 841 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.122021141513520 (code B ref -1); Sun, 31 Aug 2008 19:45:03 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 31 Aug 2008 19:36:55 +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 m7VJapeJ013514 for ; Sun, 31 Aug 2008 12:36:52 -0700 Original-Received: from mail.gnu.org ([199.232.76.166]:43905 helo=mx10.gnu.org) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1KZshg-0006HU-ML for emacs-pretest-bug@gnu.org; Sun, 31 Aug 2008 15:35:16 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1KZsj8-0004QS-Db for emacs-pretest-bug@gnu.org; Sun, 31 Aug 2008 15:36:51 -0400 Original-Received: from sbcs.cs.sunysb.edu ([130.245.1.15]:52341) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KZsj8-0004OQ-1q for emacs-pretest-bug@gnu.org; Sun, 31 Aug 2008 15:36:46 -0400 Original-Received: from kiferserv (compserv1 [130.245.1.44]) by sbcs.cs.sunysb.edu (8.13.6/8.12.11) with ESMTP id m7VJabvR012012; Sun, 31 Aug 2008 15:36:37 -0400 (EDT) In-Reply-To: <48BA9F45.2090908@gmail.com> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.12.9; i486-pc-linux-gnu) X-detected-kernel: by monty-python.gnu.org: Solaris 10 (1203?) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Resent-Date: Sun, 31 Aug 2008 15:47: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:19940 gmane.emacs.pretest.bugs:22911 Archived-At: 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. 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' > >