Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 285-296)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * gnus--rel--5.10  (patch 102-104)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64

1 files changed, 3 insertions, 2 deletions

diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index b9d04522181..5e322b9276a 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -467,7 +467,7 @@ If non-nil, NEW means to create a new buffer no matter what."
          (cvs-mode)
          (set (make-local-variable 'list-buffers-directory) buffer-name)
          ;;(set (make-local-variable 'cvs-temp-buffer) (cvs-temp-buffer))
-         (let ((cookies (ewoc-create 'cvs-fileinfo-pp "\n" "")))
+         (let ((cookies (ewoc-create 'cvs-fileinfo-pp "\n\n" "\n" t)))
            (set (make-local-variable 'cvs-cookies) cookies)
            (add-hook 'kill-buffer-hook
                      (lambda ()
@@ -618,7 +618,7 @@ If non-nil, NEW means to create a new buffer no matter what."
          (str (car hf))
          (done "")
          (tin (ewoc-nth cvs-cookies 0)))
-    (if (eq (length str) 1) (setq str ""))
+    (if (eq (length str) 2) (setq str ""))
     ;; look for the first *real* fileinfo (to determine emptyness)
     (while
         (and tin
@@ -633,6 +633,7 @@ If non-nil, NEW means to create a new buffer no matter what."
         (setq str (replace-match "" t t str))
         (if (zerop (length str)) (setq str "\n"))
         (setq done (concat "-- last cmd: " cmd " --"))))
+    (setq str (concat str "\n") done (concat done "\n"))
     ;; set the new header and footer
     (ewoc-set-hf cvs-cookies
                  str (concat "\n--------------------- "