[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el, v [EMACS_22_BASE]

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        07/11/16 03:16:36

Index: pcvs-parse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pcvs-parse.el,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -u -b -r1.30.2.2 -r1.30.2.3
--- pcvs-parse.el       13 Aug 2007 11:37:50 -0000      1.30.2.2
+++ pcvs-parse.el       16 Nov 2007 03:16:32 -0000      1.30.2.3
@@ -235,7 +235,7 @@
              ;; 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))))
@@ -272,8 +272,9 @@
        ;; branches, or because it's been removed).
        (if (ignore-errors
              (with-temp-buffer
-               (insert-file-contents (expand-file-name
-                                      ".cvsignore" (file-name-directory dir)))
+                (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)) "/$")