(cvs-string->strings): Strip trailing whitespace.

2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 98410285828..fc9baa42987 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,10 @@
         (line-move): Don't perform auto-window-vscroll when defining or
         executing keyboard macro to ensure consistent behaviour.
 
+2005-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcvs-util.el (cvs-string->strings): Strip trailing whitespace.
+
 2005-03-13  Lute Kamstra  <lute@gnu.org>
 
         * emacs-lisp/debug.el (debug): Set debug-on-exit before calling
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index a4eda95e23e..2cbb00b324c 100644
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -1,7 +1,7 @@
 ;;; pcvs-util.el --- utility functions for PCL-CVS  -*- byte-compile-dynamic: t -*-
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2004  Free Software Foundation, Inc.
+;;   2000, 2001, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
@@ -205,8 +205,8 @@ It understands elisp style quoting within STRING such that
 The SEPARATOR regexp defaults to \"\\s-+\"."
   (let ((sep (or separator "\\s-+"))
         (i (string-match "[\"]" string)))
-    (if (null i) (split-string string sep)      ; no quoting:  easy
-      (append (unless (eq i 0) (split-string (substring string 0 i) sep))
+    (if (null i) (split-string string sep t)    ; no quoting:  easy
+      (append (unless (eq i 0) (split-string (substring string 0 i) sep t))
               (let ((rfs (read-from-string string i)))
                 (cons (car rfs)
                       (cvs-string->strings (substring string (cdr rfs))