X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/99a33b77e15b9a075024701d060d912b2fd87caf..fc0c5af8380cdbfa64fd082a65461e3cc20737b0:/lisp/vc/pcvs-parse.el

diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el
index c514026b1f..c267f32b2d 100644
--- a/lisp/vc/pcvs-parse.el
+++ b/lisp/vc/pcvs-parse.el
@@ -1,6 +1,6 @@
 ;;; pcvs-parse.el --- the CVS output parser
 
-;; Copyright (C) 1991-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2013 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
@@ -32,8 +32,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
-
 (require 'pcvs-util)
 (require 'pcvs-info)
 
@@ -117,7 +115,7 @@ If RE matches, advance the point until the line after the match and
 then assign the variables as specified in MATCHES (via `setq')."
   (cons 'cvs-do-match
 	(cons re (mapcar (lambda (match)
-			   `(cons ',(first match) ,(second match)))
+			   `(cons ',(car match) ,(cadr match)))
 			 matches))))
 
 (defun cvs-do-match (re &rest matches)
@@ -150,8 +148,8 @@ Match RE and if successful, execute MATCHES."
     (cvs-or
      (funcall parse-spec)
 
-     (dolist (re cvs-parse-ignored-messages)
-       (when (cvs-match re) (return t)))
+     (cl-dolist (re cvs-parse-ignored-messages)
+       (when (cvs-match re) (cl-return t)))
 
      ;; This is a parse error.  Create a message-type fileinfo.
      (and
@@ -221,7 +219,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
       ;; ?: Unknown file.
       (let ((code (aref c 0)))
 	(cvs-parsed-fileinfo
-	 (case code
+	 (pcase code
 	   (?M 'MODIFIED)
 	   (?A 'ADDED)
 	   (?R 'REMOVED)
@@ -238,7 +236,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
 		(if (re-search-forward "^<<<<<<< " nil t)
 		    'CONFLICT 'NEED-MERGE))))
 	   (?J 'NEED-MERGE)		;not supported by standard CVS
-	   ((?U ?P)
+	   ((or ?U ?P)
 	    (if dont-change-disc 'NEED-UPDATE
 	      (cons 'UP-TO-DATE (if (eq code ?U) 'UPDATED 'PATCHED)))))
 	 path 'trust)))
@@ -423,14 +421,14 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
 	(cvs-match "restoring \\(.*\\) from backup file .*$" (path 1))))
       t)
 
-     ;; Is it a succesful merge?
+     ;; Is it a successful merge?
      ;; Figure out result of merging (ie, was there a conflict?)
      (let ((qfile (regexp-quote path)))
        (cvs-or
 	;; Conflict
 	(and
 	 (cvs-match (concat "C \\(.*" qfile "\\)$") (path 1) (type 'CONFLICT))
-	 ;; C might be followed by a "suprious" U for non-mergeable files
+	 ;; C might be followed by a "spurious" U for non-mergable files
 	 (cvs-or (cvs-match (concat "U \\(.*" qfile "\\)$")) t))
 	;; Successful merge
 	(cvs-match (concat "M \\(.*" qfile "\\)$") (path 1))