* bug#837: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size @ 2008-08-31 13:40 ` Lennart Borgman (gmail) 2008-08-31 19:36 ` bug#841: " Michael Kifer 2008-09-03 0:25 ` bug#837: " Emacs bug Tracking System 0 siblings, 2 replies; 8+ messages in thread From: Lennart Borgman (gmail) @ 2008-08-31 13:40 UTC (permalink / raw) To: emacs-pretest-bug, Michael Kifer 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" "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: ! 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' ^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#841: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size 2008-08-31 13:40 ` bug#837: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Lennart Borgman (gmail) @ 2008-08-31 19:36 ` Michael Kifer 2008-08-31 21:40 ` bug#843: " Lennart Borgman (gmail) 2008-09-03 0:25 ` bug#841: " Emacs bug Tracking System 2008-09-03 0:25 ` bug#837: " Emacs bug Tracking System 1 sibling, 2 replies; 8+ messages in thread From: Michael Kifer @ 2008-08-31 19:36 UTC (permalink / raw) To: Lennart Borgman (gmail); +Cc: emacs-pretest-bug On Sun, 31 Aug 2008 15:40:21 +0200 "Lennart Borgman (gmail)" <lennart.borgman@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. 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' > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#843: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size 2008-08-31 19:36 ` bug#841: " Michael Kifer @ 2008-08-31 21:40 ` Lennart Borgman (gmail) 2008-08-31 22:43 ` bug#844: " Michael Kifer 2008-09-03 0:25 ` bug#843: " Emacs bug Tracking System 2008-09-03 0:25 ` bug#841: " Emacs bug Tracking System 1 sibling, 2 replies; 8+ messages in thread From: Lennart Borgman (gmail) @ 2008-08-31 21:40 UTC (permalink / raw) To: kifer; +Cc: emacs-pretest-bug Michael Kifer wrote: > > On Sun, 31 Aug 2008 15:40:21 +0200 > "Lennart Borgman (gmail)" <lennart.borgman@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' >> >> > ^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#844: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size 2008-08-31 21:40 ` bug#843: " Lennart Borgman (gmail) @ 2008-08-31 22:43 ` Michael Kifer 2008-09-03 0:25 ` bug#844: marked as done (23.0.60; ediff-merge-revision: Buffer exceeds maximum size) Emacs bug Tracking System 2008-09-03 0:25 ` bug#843: " Emacs bug Tracking System 1 sibling, 1 reply; 8+ messages in thread From: Michael Kifer @ 2008-08-31 22:43 UTC (permalink / raw) To: Lennart Borgman (gmail); +Cc: emacs-pretest-bug On Sun, 31 Aug 2008 23:40:13 +0200 "Lennart Borgman (gmail)" <lennart.borgman@gmail.com> wrote: > Michael Kifer wrote: > > > > On Sun, 31 Aug 2008 15:40:21 +0200 > > "Lennart Borgman (gmail)" <lennart.borgman@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? I don't know -haven't seen this. But the main problem seems to have been that diff -c produced a very large buffer, although I can't imagine how big it could have been in order to cause the "Buffer exceeds maximum size" error. In any case, it seems to be a problem with diff or call-process, if at all. > > 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' > >> > >> > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#844: marked as done (23.0.60; ediff-merge-revision: Buffer exceeds maximum size) 2008-08-31 22:43 ` bug#844: " Michael Kifer @ 2008-09-03 0:25 ` Emacs bug Tracking System 0 siblings, 0 replies; 8+ messages in thread From: Emacs bug Tracking System @ 2008-09-03 0:25 UTC (permalink / raw) To: Chong Yidong [-- Attachment #1: Type: text/plain, Size: 875 bytes --] 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.) -- 844: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=844 Emacs Bug Tracking System Contact don@donarmstrong.com with problems [-- Attachment #2: Type: message/rfc822, Size: 5500 bytes --] From: Michael Kifer <kifer@cs.sunysb.edu> To: "Lennart Borgman (gmail)" <lennart.borgman@gmail.com> Cc: emacs-pretest-bug@gnu.org Subject: Re: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Date: Sun, 31 Aug 2008 18:43:54 -0400 Message-ID: <20080831184354.0dafde58@kiferserv> On Sun, 31 Aug 2008 23:40:13 +0200 "Lennart Borgman (gmail)" <lennart.borgman@gmail.com> wrote: > Michael Kifer wrote: > > > > On Sun, 31 Aug 2008 15:40:21 +0200 > > "Lennart Borgman (gmail)" <lennart.borgman@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? I don't know -haven't seen this. But the main problem seems to have been that diff -c produced a very large buffer, although I can't imagine how big it could have been in order to cause the "Buffer exceeds maximum size" error. In any case, it seems to be a problem with diff or call-process, if at all. > > 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' > >> > >> > > > [-- Attachment #3: Type: message/rfc822, Size: 1014 bytes --] From: Chong Yidong <cyd@stupidchicken.com> To: "Lennart Borgman \(gmail\)" <lennart.borgman@gmail.com> Cc: 844-done@emacsbugs.donarmstrong.com Subject: Re: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Date: Tue, 02 Sep 2008 20:19:27 -0400 Message-ID: <871w026pyo.fsf@cyd.mit.edu> Are you able to reproduce this? ^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#843: marked as done (23.0.60; ediff-merge-revision: Buffer exceeds maximum size) 2008-08-31 21:40 ` bug#843: " Lennart Borgman (gmail) 2008-08-31 22:43 ` bug#844: " Michael Kifer @ 2008-09-03 0:25 ` Emacs bug Tracking System 1 sibling, 0 replies; 8+ messages in thread From: Emacs bug Tracking System @ 2008-09-03 0:25 UTC (permalink / raw) To: Chong Yidong [-- Attachment #1: Type: text/plain, Size: 875 bytes --] 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.) -- 844: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=844 Emacs Bug Tracking System Contact don@donarmstrong.com with problems [-- Attachment #2: Type: message/rfc822, Size: 5400 bytes --] From: "Lennart Borgman (gmail)" <lennart.borgman@gmail.com> To: kifer@cs.sunysb.edu Cc: emacs-pretest-bug@gnu.org Subject: Re: 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> Michael Kifer wrote: > > On Sun, 31 Aug 2008 15:40:21 +0200 > "Lennart Borgman (gmail)" <lennart.borgman@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' >> >> > [-- Attachment #3: Type: message/rfc822, Size: 1014 bytes --] From: Chong Yidong <cyd@stupidchicken.com> To: "Lennart Borgman \(gmail\)" <lennart.borgman@gmail.com> Cc: 844-done@emacsbugs.donarmstrong.com Subject: Re: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Date: Tue, 02 Sep 2008 20:19:27 -0400 Message-ID: <871w026pyo.fsf@cyd.mit.edu> Are you able to reproduce this? ^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#841: marked as done (23.0.60; ediff-merge-revision: Buffer exceeds maximum size) 2008-08-31 19:36 ` bug#841: " Michael Kifer 2008-08-31 21:40 ` bug#843: " Lennart Borgman (gmail) @ 2008-09-03 0:25 ` Emacs bug Tracking System 1 sibling, 0 replies; 8+ messages in thread From: Emacs bug Tracking System @ 2008-09-03 0:25 UTC (permalink / raw) To: Chong Yidong [-- Attachment #1: Type: text/plain, Size: 875 bytes --] 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.) -- 844: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=844 Emacs Bug Tracking System Contact don@donarmstrong.com with problems [-- Attachment #2: Type: message/rfc822, Size: 4420 bytes --] From: Michael Kifer <kifer@cs.sunysb.edu> To: "Lennart Borgman (gmail)" <lennart.borgman@gmail.com> Cc: emacs-pretest-bug@gnu.org Subject: Re: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Date: Sun, 31 Aug 2008 15:36:37 -0400 Message-ID: <20080831153637.1103334a@kiferserv> On Sun, 31 Aug 2008 15:40:21 +0200 "Lennart Borgman (gmail)" <lennart.borgman@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. 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' > > [-- Attachment #3: Type: message/rfc822, Size: 1014 bytes --] From: Chong Yidong <cyd@stupidchicken.com> To: "Lennart Borgman \(gmail\)" <lennart.borgman@gmail.com> Cc: 844-done@emacsbugs.donarmstrong.com Subject: Re: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Date: Tue, 02 Sep 2008 20:19:27 -0400 Message-ID: <871w026pyo.fsf@cyd.mit.edu> Are you able to reproduce this? ^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#837: marked as done (23.0.60; ediff-merge-revision: Buffer exceeds maximum size) 2008-08-31 13:40 ` bug#837: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Lennart Borgman (gmail) 2008-08-31 19:36 ` bug#841: " Michael Kifer @ 2008-09-03 0:25 ` Emacs bug Tracking System 1 sibling, 0 replies; 8+ messages in thread From: Emacs bug Tracking System @ 2008-09-03 0:25 UTC (permalink / raw) To: Chong Yidong [-- Attachment #1: Type: text/plain, Size: 875 bytes --] 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.) -- 844: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=844 Emacs Bug Tracking System Contact don@donarmstrong.com with problems [-- Attachment #2: Type: message/rfc822, Size: 4127 bytes --] From: "Lennart Borgman (gmail)" <lennart.borgman@gmail.com> To: emacs-pretest-bug@gnu.org, Michael Kifer <kifer@cs.sunysb.edu> Subject: 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> 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" "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: ! 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' [-- Attachment #3: Type: message/rfc822, Size: 1014 bytes --] From: Chong Yidong <cyd@stupidchicken.com> To: "Lennart Borgman \(gmail\)" <lennart.borgman@gmail.com> Cc: 844-done@emacsbugs.donarmstrong.com Subject: Re: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Date: Tue, 02 Sep 2008 20:19:27 -0400 Message-ID: <871w026pyo.fsf@cyd.mit.edu> Are you able to reproduce this? ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-09-03 0:25 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <871w026pyo.fsf@cyd.mit.edu> 2008-08-31 13:40 ` bug#837: 23.0.60; ediff-merge-revision: Buffer exceeds maximum size Lennart Borgman (gmail) 2008-08-31 19:36 ` bug#841: " Michael Kifer 2008-08-31 21:40 ` bug#843: " Lennart Borgman (gmail) 2008-08-31 22:43 ` bug#844: " Michael Kifer 2008-09-03 0:25 ` bug#844: marked as done (23.0.60; ediff-merge-revision: Buffer exceeds maximum size) Emacs bug Tracking System 2008-09-03 0:25 ` bug#843: " Emacs bug Tracking System 2008-09-03 0:25 ` bug#841: " Emacs bug Tracking System 2008-09-03 0:25 ` bug#837: " Emacs bug Tracking System
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/emacs.git https://git.savannah.gnu.org/cgit/emacs/org-mode.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.