[Emacs-diffs] Changes to emacs/lisp/cvs-status.el

[Juanma Barranquero]

Index: emacs/lisp/cvs-status.el
diff -c emacs/lisp/cvs-status.el:1.17 emacs/lisp/cvs-status.el:1.18
*** emacs/lisp/cvs-status.el:1.17       Wed Apr 21 22:31:19 2004
--- emacs/lisp/cvs-status.el    Fri May 28 19:07:57 2004
***************
*** 277,286 ****
               (cvs-tree-merge (cdr tree1) (cdr tree2))))))
       ((> l1 l2)
        (cvs-tree-merge
!        (list (cons (cvs-tag-make (cvs-butlast vl1)) tree1)) tree2))
       ((< l1 l2)
        (cvs-tree-merge
!        tree1 (list (cons (cvs-tag-make (cvs-butlast vl2)) tree2)))))))))
  
  (defun cvs-tag-make-tag (tag)
    (let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\."))))
--- 277,286 ----
               (cvs-tree-merge (cdr tree1) (cdr tree2))))))
       ((> l1 l2)
        (cvs-tree-merge
!        (list (cons (cvs-tag-make (butlast vl1)) tree1)) tree2))
       ((< l1 l2)
        (cvs-tree-merge
!        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,299 ****
          (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)))
                            tag)))))
          tags)))
      (while (cdr tags)
--- 293,299 ----
          (lambda (tag)
            (let ((tag (cvs-tag-make-tag tag)))
              (list (if (not (eq (cvs-tag->type tag) 'branch)) tag
!                     (list (cvs-tag-make (butlast (cvs-tag->vlist tag)))
                            tag)))))
          tags)))
      (while (cdr tags)