On Thu, Sep 25, 2003 at 07:49:12PM -0700, Ilya Zakharevich wrote: > This patch fixes several problems with the debugger: I would like this in 5.8.2 but the patch won't apply cleanly to blead I think I know why. I can see where this hunk of change should go > @@ -1512,10 +1512,8 @@ with a slave editor, Epoc). > $console = undef; > } > > - # In OS/2, we need to use STDIN to get textmode too, even though > - # it pretty much looks like Unix otherwise. > - if (defined $ENV{OS2_SHELL} and ($slave_editor or $ENV{WINDOWID})) > - { # In OS/2 > + if ($^O eq 'os2' and ($slave_editor or $ENV{WINDOWID})) > + { # uncomplete support of /dev/con on xterm and other X terminals > $console = undef; > } > # EPOC also falls into the 'got to use STDIN' camp. I'm not sure where this hunk of change should go. I can find the surrounding text still in the last but 3 version of the file: http://public.activestate.com/cgi-bin/perlbrowse?file=lib%2Fperl5db.pl&rev=98 > @@ -2054,6 +2052,8 @@ the new command. This is faster, but per > # No signal is active. > $signal = 0; > > + $cmd =~ s/\r+\z//; # Remove spurious \r due to wrong binmode... > + > # Handle continued commands (ending with \): > $cmd =~ s/\\$/\n/ && do { > $cmd .= &readline(" cont: "); It appears that there are several changes made to the debugger in blead that aren't yet in maint. I don't know why Jarkko didn't merge them. I'm also not sure what to do now. I'd like this debugger patch in maint, but I don't use the debugger, so don't have a good idea of how to test any 3 way merging I do. Hence I'll get some of it wrong if I try. Also, it will take time, which is something I don't have huge amounts of right now. So unless someone not me (doesn't have to be Ilya) steps forward and integrates these changes into blead's debugger, it's not going to get in until 5.8.3. [Because I will have more time then and will try to do it] Nicholas ClarkThread Previous | Thread Next