From 1703d649a7ef3303239c039665f6014d56c5ce6b Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 28 May 2004 19:07:57 +0000 Subject: [PATCH] (cvs-tree-merge, cvs-tags->tree): Use `butlast', not `cvs-butlast'. --- lisp/cvs-status.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el index 96b1f1eb066..b03182d87e4 100644 --- a/lisp/cvs-status.el +++ b/lisp/cvs-status.el @@ -277,10 +277,10 @@ BEWARE: because of stability issues, this is not a symetric operation." (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 @@ BEWARE: because of stability issues, this is not a symetric operation." (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) -- 2.39.5