Mercurial > emacs
diff lisp/cvs-status.el @ 55790:45bf91de4d41
(cvs-tree-merge, cvs-tags->tree): Use `butlast', not `cvs-butlast'.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Fri, 28 May 2004 19:07:57 +0000 |
| parents | 913c2e3a059f |
| children | 5ca81cc9c2de 4c90ffeb71c5 |
line wrap: on
line diff
--- 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)