[Emacs-diffs] Changes to emacs/lib-src/b2m.pl

[Pavel Janík]

Index: emacs/lib-src/b2m.pl
diff -c emacs/lib-src/b2m.pl:1.1 emacs/lib-src/b2m.pl:1.2
*** emacs/lib-src/b2m.pl:1.1    Wed Jun 26 11:49:23 2002
--- emacs/lib-src/b2m.pl        Fri Jul  5 15:56:34 2002
***************
*** 30,36 ****
  use Date::Parse;
  
  my($whoami) = basename $0;
! my($version) = '$Revision: 1.1 $';
  my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] 
[Babyl-file]
  \tBy default, full headers are printed.\n";
  
--- 30,36 ----
  use Date::Parse;
  
  my($whoami) = basename $0;
! my($version) = '$Revision: 1.2 $';
  my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] 
[Babyl-file]
  \tBy default, full headers are printed.\n";
  
***************
*** 62,68 ****
  
  while (<>) {
      my($msg_num) = $. - 1;
!     my($labels, $full_header, $header);
      my($from_line, $from_addr);
      my($time);
  
--- 62,68 ----
  
  while (<>) {
      my($msg_num) = $. - 1;
!     my($labels, $pruned, $full_header, $header);
      my($from_line, $from_addr);
      my($time);
  
***************
*** 79,85 ****
      }
      $labels = $1;
  
!     s/(?:((?:.+\n)+)\n+)?\*\*\* EOOH \*\*\*\n+// || goto malformatted;
      $full_header = $1;
  
      if (s/((?:.+\n)+)\n+//) {
--- 79,89 ----
      }
      $labels = $1;
  
!     # Strip the integer indicating whether the header is pruned
!     $labels =~ s/^(\d+)[,\s]*//; 
!     $pruned = $1;
! 
!     s/(?:((?:.+\n)+)\n*)?\*\*\* EOOH \*\*\*\n+// || goto malformatted;
      $full_header = $1;
  
      if (s/((?:.+\n)+)\n+//) {
***************
*** 91,97 ****
        $_ = '';
      }
  
!     if (! $full_header) {
        $full_header = $header;
      }
  
--- 95,104 ----
        $_ = '';
      }
  
!     # "$pruned eq '0'" is different from "! $pruned".  We want to make
!     # sure that we found a valid label line which explicitly indicated
!     # that the header was not pruned.
!     if ((! $full_header) || ($pruned eq '0')) {
        $full_header = $header;
      }
  
***************
*** 101,108 ****
      # Quote "^From "
      s/(^|\n)From /$1>From /g;
  
-     # Strip the integer indicating whether the header is pruned
-     $labels =~ s/^\d+[,\s]*//; 
      # Strip extra commas and whitespace from the end
      $labels =~ s/[,\s]+$//;
      # Now collapse extra commas and whitespace in the remaining label string
--- 108,113 ----