Index: pcl-cvs.el
===================================================================
RCS file: /home2/cvsroot/ccvs/tools/pcl-cvs/pcl-cvs.el,v
retrieving revision 1.7
diff -c -r1.7 pcl-cvs.el
*** pcl-cvs.el	1998/01/04 14:24:13	1.7
--- pcl-cvs.el	1998/02/19 19:49:03
***************
*** 153,161 ****
  conditions; again, consult the TeXinfo manual for details.")
    "*Startup message for CVS.")
  
- (defconst pcl-cvs-bugs-address "pcl-cvs-auto-bugs@cyclic.com"
-   "The destination address used for the default bug report form.")
- 
  (defvar cvs-stdout-file nil
    "Name of the file that holds the output that CVS sends to stdout.
  This variable is buffer local.")
--- 153,158 ----
***************
*** 977,1032 ****
  Args:  STDOUT-BUFFER STDERR-BUFFER ERR-BUF POS &optional INDICATOR.
  
  ERR-BUF should be 'STDOUT or 'STDERR."
! 
!   (setq pos (1- pos))
!   (set-buffer cvs-buffer-name)
!   (setq buffer-read-only nil)
!   (erase-buffer)
!   (insert "To: " pcl-cvs-bugs-address "\n")
!   (insert "Subject: pcl-cvs release" pcl-cvs-version " parse error.\n")
!   (insert (concat mail-header-separator "\n"))
!   (insert "This bug report is automatically generated by pcl-cvs\n")
!   (insert "because it doesn't understand some output from CVS.  Below\n")
!   (insert "is detailed information about the error.  Please send\n")
!   (insert "this, together with any information you think might be\n")
!   (insert "useful for me to fix the bug, to the address above.  But\n")
!   (insert "please check the \"known problems\" section of the\n")
!   (insert "documentation first.  Note that this buffer contains\n")
!   (insert "information that you might consider confidential.  You\n")
!   (insert "are encouraged to read through it before sending it.\n")
!   (insert "\n")
!   (insert "Press C-c C-c to send this email.\n\n")
!   (insert "Please state the version of these programs you are using:\n\n")
!   (insert "RCS:  \ndiff: \n\n")
! 
!   (let* ((stdout (save-excursion (set-buffer stdout-buffer) (buffer-string)))
! 	 (stderr (save-excursion (set-buffer stderr-buffer) (buffer-string)))
! 	 (errstr (if (eq err-buf 'STDOUT) stdout stderr))
! 	 (errline-end (string-match "\n" errstr pos))
! 	 (errline (substring errstr pos errline-end)))
!     (insert (format "Offending line (%d chars): >" (- errline-end pos)))
!     (insert errline)
!     (insert "<\n")
!     (insert "Sent to " (symbol-name err-buf) " at pos " (format "%d\n" pos))
!     (if indicator
! 	(insert "Optional args: \"" indicator "\".\n"))
!     (insert "\nEmacs-version: " (emacs-version) "\n")
!     (insert "Pcl-cvs Version: "
! 	    "@(#)OrigId: pcl-cvs.el,v 1.93 1993/05/31 22:44:00 ceder Exp\n")
!     (insert "CVS Version: "
! 	    "@(#)cvs/contrib/pcl-cvs:$Name:  $:$Id: pclerr,v 1.1.1.1 2001/04/14 00:10:25 dprice Exp $\n\n")
!     (insert (format "--- Contents of stdout buffer (%d chars) ---\n"
! 		    (length stdout)))
!     (insert stdout)
!     (insert "--- End of stdout buffer ---\n")
!     (insert (format "--- Contents of stderr buffer (%d chars) ---\n"
! 		    (length stderr)))
!     (insert stderr)
!     (insert "--- End of stderr buffer ---\n")
!     (insert "\nEnd of bug report.\n")
!     (require 'sendmail)
!     (mail-mode)
!     (error "CVS parse error - please report this bug.")))
        
  ;;----------
  (defun cvs-parse-update (stdout-buffer stderr-buffer)
--- 974,984 ----
  Args:  STDOUT-BUFFER STDERR-BUFFER ERR-BUF POS &optional INDICATOR.
  
  ERR-BUF should be 'STDOUT or 'STDERR."
!   ;; This used to send email to a bug-reporting address.  A better
!   ;; idea is to just cope with our inability to parse (although some
!   ;; functionality may be limited in this case).  I see that pcl-cvs 2.0b2
!   ;; has taken the latter approach.
!   (error "CVS parse error - this is a pcl-cvs bug."))
        
  ;;----------
  (defun cvs-parse-update (stdout-buffer stderr-buffer)