(calendar-dst-check-each-year-flag): Avoid

[gnu-emacs] / lisp / pcvs-parse.el

diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el
index 7ab6c53b4a003bdb0891d80de19f67e75b7567b1..bd4931265324229594f103a8d6c58b417bd1afc5 100644 (file)
--- a/lisp/pcvs-parse.el
+++ b/lisp/pcvs-parse.el
@@ -1,9 +1,9 @@
 ;;; 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, 2002, 2003, 2004, 2005, 2006 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.
@@ -20,8 +20,8 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -271,8 +271,8 @@ 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
+             (with-temp-buffer
+               (insert-file-contents (expand-file-name
                                       ".cvsignore" (file-name-directory dir)))
                (goto-char (point-min))
                (re-search-forward
@@ -285,7 +285,8 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
        (and
        (cvs-or
         (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))