--- a/lisp/pcl-cvs/pcl-cvs.el	Mon Aug 13 09:20:50 2007 +0200
+++ b/lisp/pcl-cvs/pcl-cvs.el	Mon Aug 13 09:21:54 2007 +0200
@@ -1,10 +1,10 @@
 ;;;
 ;;;#ident "@(#)OrigId: pcl-cvs.el,v 1.93 1993/05/31 22:44:00 ceder Exp "
 ;;;
-;;;#ident "@(#)cvs/contrib/pcl-cvs:$Name: r20-0b33 $:$Id: pcl-cvs.el,v 1.2 1996/12/28 21:03:03 steve Exp $"
+;;;#ident "@(#)cvs/contrib/pcl-cvs:$Name: r20-1b9 $:$Id: pcl-cvs.el,v 1.3 1997/03/22 06:02:36 steve Exp $"
 ;;;
 ;;; pcl-cvs.el -- A Front-end to CVS 1.3 or later.
-;;; Release 1.05-CVS-$Name: r20-0b33 $.
+;;; Release 1.05-CVS-$Name: r20-1b9 $.
 ;;; Copyright (C) 1991, 1992, 1993  Per Cederqvist
 
 ;;; This program is free software; you can redistribute it and/or modify
@@ -126,7 +126,7 @@
 ;;;	     END OF THINGS TO CHECK WHEN INSTALLING
 ;;; --------------------------------------------------------
 
-(defconst pcl-cvs-version "1.05-CVS-$Name: r20-0b33 $"
+(defconst pcl-cvs-version "1.05-CVS-$Name: r20-1b9 $"
   "A string denoting the current release version of pcl-cvs.")
 
 ;; You are NOT allowed to disable this message by default.  However, you
@@ -139,8 +139,8 @@
 
 (defconst cvs-startup-message
   (if cvs-inhibit-copyright-message
-      "PCL-CVS release 1.05-CVS-$Name: r20-0b33 $"
-    "PCL-CVS release 1.05 from CVS release $Name: r20-0b33 $.
+      "PCL-CVS release 1.05-CVS-$Name: r20-1b9 $"
+    "PCL-CVS release 1.05 from CVS release $Name: r20-1b9 $.
 Copyright (C) 1992, 1993 Per Cederqvist
 Pcl-cvs comes with absolutely no warranty; for details consult the manual.
 This is free software, and you are welcome to redistribute it under certain
@@ -724,7 +724,7 @@
 \\[cvs-mode-undo-local-changes]   Revert the last checked in version - discard your changes to the file.
 
 Entry to this mode runs cvs-mode-hook.
-This description is updated for release 1.05-CVS-$Name: r20-0b33 $ of pcl-cvs.
+This description is updated for release 1.05-CVS-$Name: r20-1b9 $ of pcl-cvs.
 
 All bindings:
 \\{cvs-mode-map}"
@@ -1013,7 +1013,7 @@
     (insert "Pcl-cvs Version: "
 	    "@(#)OrigId: pcl-cvs.el,v 1.93 1993/05/31 22:44:00 ceder Exp\n")
     (insert "CVS Version: "
-	    "@(#)lisp/pcl-cvs:$Name: r20-0b33 $:$Id: pcl-cvs.el,v 1.2 1996/12/28 21:03:03 steve Exp $\n\n")
+	    "@(#)lisp/pcl-cvs:$Name: r20-1b9 $:$Id: pcl-cvs.el,v 1.3 1997/03/22 06:02:36 steve Exp $\n\n")
     (insert (format "--- Contents of stdout buffer (%d chars) ---\n"
 		    (length stdout)))
     (insert stdout)
@@ -1410,6 +1410,13 @@
 		(setcdr head (list fileinfo))
 		(setq head (cdr head)))))))
 
+         ;; Patch failure message with CVS client.
+         ;; Ignore, since a failed patch implies that the file proper
+         ;; subsequently will be fetched from the server.
+	 ((looking-at
+	   "^[0-9]+ out of [0-9]+ hunks failed--saving rejects to ")
+	  (forward-line 1))
+
 	 ;; Error messages from CVS (incomplete)
 
 	 ((looking-at
@@ -1534,6 +1541,13 @@
 	(re-search-forward cvs-update-prog-output-skip-regexp)
 	(forward-line 1))
 
+       ;; Patch informational message with CVS client.
+       ;; Ignore, since this simply tells us that the patch in question
+       ;; already has been applied to the file.
+       ((looking-at
+	 "^.* already contains the differences between .* and ")
+        (forward-line 1))
+
        (t
 	(cvs-parse-error stdout-buffer stderr-buffer 'STDOUT (point)
 			 "cvs-parse-stdout"))))))
@@ -3301,7 +3315,7 @@
 		      (regexp-quote (if (and (boundp 'add-log-mailing-address)
 					     add-log-mailing-address)
 					add-log-mailing-address
-				      user-mail-address)))))
+				      (user-mail-address))))))
 
 (defun cvs-relative-path (base child)
   "Return a directory path relative to BASE for CHILD.