(cvs-revert-if-needed): Ignore `unknown' files, since cvs

did not touch them.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index edc8ae70dd28682f4b5e5506ccba37762c0d9dfe..f39752b4e18b98b3bd62a0c23602379973c41b60 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * pcvs.el (cvs-revert-if-needed): Ignore `unknown' files, since cvs
+       did not touch them.
+
 2007-11-15  Jay Belanger  <jay.p.belanger@gmail.com>
 
        * calc/calc-menu.el: New file.
@@ -30,8 +35,7 @@
        (byte-compile-nilconstp): New function.
        (byte-optimize-cond): Kill subsequent branches when a branch is
        know to be taken or not taken.
-       (byte-optimize-if): Use byte-compile-nilconstp instead of hand
-       coding.
+       (byte-optimize-if): Use byte-compile-nilconstp instead of hand coding.
 
 2007-11-13  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -40,8 +44,8 @@
 
 2007-11-12  Michael Albinus  <michael.albinus@gmx.de>
 
-       * net/tramp.el (tramp-open-connection-setup-interactive-shell): Check
-       whether the output of "uname -sr" has been changed.
+       * net/tramp.el (tramp-open-connection-setup-interactive-shell):
+       Check whether the output of "uname -sr" has been changed.
 
 2007-11-12  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
@@ -55,8 +59,7 @@
        a bootstrap failure.
 
        * vc-cvs.el (vc-cvs-diff): If backup files exist, diff them
-       instead of doing "cvs diff" in order to avoid accessing the
-       repository.
+       instead of doing "cvs diff" in order to avoid accessing the repository.
 
 2007-11-12  Kevin Ryde  <user42@zip.com.au>
 

diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index a0bac0b287133307626c737c07297d53621c2fb5..b0b5d919cb0c6c73d742f16206f96264259bd4c3 100644 (file)
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -2291,7 +2291,7 @@ this file, or a list of arguments to send to the program."
           (buffer (find-buffer-visiting file)))
       ;; For a revert to happen the user must be editing the file...
       (unless (or (null buffer)
-                 (eq (cvs-fileinfo->type fileinfo) 'MESSAGE)
+                 (eq (cvs-fileinfo->type fileinfo) '(MESSAGE UNKNOWN))
                  ;; FIXME: check whether revert is really needed.
                  ;; `(verify-visited-file-modtime buffer)' doesn't cut it
                  ;; because it only looks at the time stamp (it ignores