(mac-text-encoding-ascii): New constant.

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

diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el
index 1b08473d305c73c803fb6a1461c41dfa6d2ed239..0193939606cb686e818082d6b1f1fe667e426c56 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.
@@ -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