(log-edit-insert-cvs-rcstemplate): Ignore stderr.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed546b62fa703ada3cde8bc87063f3ba6f5b680b..eff3ae8bae90b391e2638f1ed3f44500be670d75 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * log-edit.el (log-edit-insert-cvs-rcstemplate): Ignore stderr.
+
        * emacs-lisp/elp.el (elp-not-profilable): Replace interactive-p with
        called-interactively-p.
        (elp-profilable-p): Rename from elp-not-profilable-p.

diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 8ee8e369926cb2bb63e7b51b021e82200397feb9..4c66f7f280b4e1f72413330e231d005f2ffd3765 100644 (file)
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -448,8 +448,10 @@ This contacts the repository to get the rcstemplate file and
 can thus take some time."
   (interactive)
   (when (or (interactive-p) (= (point-min) (point-max)))
-    (when (file-readable-p "CVS/Entries")
-      (call-process "cvs" nil t nil "checkout" "-p" "CVSROOT/rcstemplate"))))
+    (when (file-readable-p "CVS/Root")
+      ;; Ignore the stderr stuff, even if it's an error.
+      (call-process "cvs" nil '(t nil) nil
+                    "checkout" "-p" "CVSROOT/rcstemplate"))))
 
 (defun log-edit-insert-filenames ()
   "Insert the list of files that are to be committed."