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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        06/10/02 00:21:08

Index: pcvs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pcvs.el,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- pcvs.el     13 Aug 2006 17:05:12 -0000      1.94
+++ pcvs.el     2 Oct 2006 00:21:07 -0000       1.95
@@ -618,7 +618,6 @@
         (str (car hf))
         (done "")
         (tin (ewoc-nth cvs-cookies 0)))
-    (if (eq (length str) 2) (setq str ""))
     ;; look for the first *real* fileinfo (to determine emptyness)
     (while
        (and tin
@@ -626,14 +625,17 @@
                   '(MESSAGE DIRCHANGE)))
       (setq tin (ewoc-next cvs-cookies tin)))
     (if add
-       (setq str (concat "-- Running " cmd " ...\n" str))
+        (progn
+          ;; Remove the default empty line, if applicable.
+          (if (not (string-match "." str)) (setq str "\n"))
+          (setq str (concat "-- Running " cmd " ...\n" str)))
       (if (not (string-match
                (concat "^-- Running " (regexp-quote cmd) " \\.\\.\\.\n") str))
          (error "Internal PCL-CVS error while removing message")
        (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"))
+        ;; Re-add the default empty line, if applicable.
+        (if (not (string-match "." str)) (setq str "\n\n"))
+       (setq done (concat "-- last cmd: " cmd " --\n"))))
     ;; set the new header and footer
     (ewoc-set-hf cvs-cookies
                 str (concat "\n--------------------- "