2 files changed, 12 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bba6b2f0564..b073528cd68 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcvs-util.el (cvs-insert-strings): Fix bug with strings longer than
+        wwidth.
+
 2006-03-31  Juanma Barranquero  <lekktu@gmail.com>
 
         * ido.el (ido-cache-unc-host-shares-time, ido-report-no-match)
@@ -440,11 +445,6 @@
         * tree-widget.el (tree-widget-themes-load-path)
         (tree-widget-themes-directory, tree-widget-theme): Doc fix.
 
-2006-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * pcvs-util.el (cvs-insert-strings): Fix bug with strings longer than
-        wwidth.
-
 2006-03-13  Ryan Yeske  <rcyeske@gmail.com>
 
         * net/rcirc.el (rcirc) <defgroup>: Add link to manual.
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 9ff40d09494..b04f3c121a1 100644
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -157,10 +157,11 @@ Uses columns to keep the listing readable but compact."
       (setq tab-width colwidth)
       ;; The insertion should be "sensible" no matter what choices were made.
       (dolist (str strings)
-        (unless (bolp) (insert " \t"))
-        (when (< wwidth (+ (max colwidth (length str)) (current-column)))
-          (delete-char -2) (insert "\n"))
-        (insert str)))))
+        (unless (bolp)
+          (insert " \t")
+          (when (< wwidth (+ (max colwidth (length str)) (current-column)))
+            (delete-char -2) (insert "\n")))
+        (insert str)))))
 
 
 (defun cvs-file-to-string (file &optional oneline args)
@@ -357,7 +358,8 @@ If ARG is nil toggle the PREFIX's value between its 0th default and nil
   and reset the persistence."
   (let* ((prefix (symbol-value (cvs-prefix-sym sym)))
          (numarg (if (integerp arg) arg 0))
-         (defs (cvs-flags-defaults prefix)))
+         ;; (defs (cvs-flags-defaults prefix))
+         )
 
     ;; set persistence if requested
     (when (> (prefix-numeric-value arg) 9)