# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1085771277 0
# Node ID 45bf91de4d414da53d7aa202a1fe6b8143a55968
# Parent  e004c3c8a4b616bf8338fa8b4b76396f9191753d
(cvs-tree-merge, cvs-tags->tree): Use `butlast', not `cvs-butlast'.

diff -r e004c3c8a4b6 -r 45bf91de4d41 lisp/cvs-status.el
--- a/lisp/cvs-status.el	Fri May 28 18:59:01 2004 +0000
+++ b/lisp/cvs-status.el	Fri May 28 19:07:57 2004 +0000
@@ -277,10 +277,10 @@
 	       (cvs-tree-merge (cdr tree1) (cdr tree2))))))
      ((> l1 l2)
       (cvs-tree-merge
-       (list (cons (cvs-tag-make (cvs-butlast vl1)) tree1)) tree2))
+       (list (cons (cvs-tag-make (butlast vl1)) tree1)) tree2))
      ((< l1 l2)
       (cvs-tree-merge
-       tree1 (list (cons (cvs-tag-make (cvs-butlast vl2)) tree2)))))))))
+       tree1 (list (cons (cvs-tag-make (butlast vl2)) tree2)))))))))
 
 (defun cvs-tag-make-tag (tag)
   (let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\."))))
@@ -293,7 +293,7 @@
 	  (lambda (tag)
 	    (let ((tag (cvs-tag-make-tag tag)))
 	      (list (if (not (eq (cvs-tag->type tag) 'branch)) tag
-		      (list (cvs-tag-make (cvs-butlast (cvs-tag->vlist tag)))
+		      (list (cvs-tag-make (butlast (cvs-tag->vlist tag)))
 			    tag)))))
 	  tags)))
     (while (cdr tags)