(flymake-process-filter): Make sure the source buffer isn't dead.

[bpt/emacs.git] / lisp / pcvs-parse.el

diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el
index 84dbf21..baec05f 100644 (file)
--- a/lisp/pcvs-parse.el
+++ b/lisp/pcvs-parse.el
@@ -1,17 +1,17 @@
 ;;; pcvs-parse.el --- the CVS output parser
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2002, 2003, 2004  Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
-;; Author: Stefan Monnier <monnier@cs.yale.edu>
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -235,7 +233,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
              ;; servers, this should not be necessary, because they return
              ;; a complete merge output.
              (with-temp-buffer
-               (insert-file-contents path)
+               (ignore-errors (insert-file-contents path))
                (goto-char (point-min))
                (if (re-search-forward "^<<<<<<< " nil t)
                    'CONFLICT 'NEED-MERGE))))
@@ -271,9 +269,10 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
        ;; on the current branch (either because it only exists in other
        ;; branches, or because it's been removed).
        (if (ignore-errors
-             (with-current-buffer
-                 (find-file-noselect (expand-file-name
-                                      ".cvsignore" (file-name-directory dir)))
+             (with-temp-buffer
+                (ignore-errors
+                  (insert-file-contents
+                   (expand-file-name ".cvsignore" (file-name-directory dir))))
                (goto-char (point-min))
                (re-search-forward
                 (concat "^" (regexp-quote (file-name-nondirectory dir)) "/$")
@@ -284,8 +283,11 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
        ;; File removed, since it is removed (by third party) in repository.
        (and
        (cvs-or
+         ;; some cvs versions output quotes around these files
+        (cvs-match "warning: `\\(.*\\)' is not (any longer) pertinent$" (file 1))
         (cvs-match "warning: \\(.*\\) is not (any longer) pertinent$" (file 1))
-        (cvs-match "\\(.*\\) is no longer in the repository$" (file 1)))
+        (cvs-match "`\\(.*\\)' is no longer in the repository$" (file 1))
+         (cvs-match "\\(.*\\) is no longer in the repository$" (file 1)))
        (cvs-parsed-fileinfo
         (if dont-change-disc '(NEED-UPDATE . REMOVED) 'DEAD) file))
 
@@ -298,7 +300,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
 
        ;; [add] this will also show up as a `U <file>'
        (and
-       (cvs-match "\\(.*\\), version \\(.*\\), resurrected$"
+       (cvs-match "`?\\(.*?\\)'?, version \\(.*\\), resurrected$"
                   (path 1) (base-rev 2))
        ;; FIXME: resurrection only brings back the original version,
        ;; not the latest on the branch, so `up-to-date' is not always
@@ -511,15 +513,19 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
        (cvs-match "new revision: \\([0-9.]*\\); previous revision: .*$"
                  (subtype 'COMMITTED) (base-rev 1)))
       (cvs-or (cvs-match "done$") t)
+      ;; In cvs-1.12.9 commit messages have been changed and became
+      ;; ambiguous.  More specifically, the `path' above is not given.
+      ;; We assume here that in future releases the corresponding info will
+      ;; be put into `file'.
       (progn
        ;; Try to remove the temp files used by VC.
-       (vc-delete-automatic-version-backups (expand-file-name path))
+       (vc-delete-automatic-version-backups (expand-file-name (or path file)))
        ;; it's important here not to rely on the default directory management
        ;; because `cvs commit' might begin by a series of Examining messages
        ;; so the processing of the actual checkin messages might begin with
        ;; a `current-dir' set to something different from ""
        (cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype)
-                            (or path file) (if path 'trust)
+                            (or path file) 'trust
                             :base-rev base-rev)))
 
      ;; useless message added before the actual addition: ignored