[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.13 emacs/lisp/cvs-status.el:1.14
*** emacs/lisp/cvs-status.el:1.13       Sat Jan  5 13:58:49 2002
--- emacs/lisp/cvs-status.el    Tue Feb  4 06:03:59 2003
***************
*** 86,92 ****
        (1 font-lock-function-name-face)))))
  (defconst cvs-status-font-lock-defaults
    '(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t)))
!   
  
  (put 'cvs-status-mode 'mode-class 'special)
  ;;;###autoload
--- 86,92 ----
        (1 font-lock-function-name-face)))))
  (defconst cvs-status-font-lock-defaults
    '(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t)))
! 
  
  (put 'cvs-status-mode 'mode-class 'special)
  ;;;###autoload
***************
*** 218,224 ****
  A tag cannot be a CONS.  The return value can also be a list of strings,
  if several nodes where merged into one.
  The tree will be printed no closer than column COLUMN."
!   
    (let* ((eol (save-excursion (end-of-line) (current-column)))
         (column (max (+ eol 2) column)))
      (if (null tags) column
--- 218,224 ----
  A tag cannot be a CONS.  The return value can also be a list of strings,
  if several nodes where merged into one.
  The tree will be printed no closer than column COLUMN."
! 
    (let* ((eol (save-excursion (end-of-line) (current-column)))
         (column (max (+ eol 2) column)))
      (if (null tags) column
***************
*** 487,495 ****
          (setq pe eq)))
        (nreverse nas))))
  
! ;;;; 
  ;;;; Merged trees from different files
! ;;;; 
  
  (defun cvs-tree-fuzzy-merge-1 (trees tree prev)
    )
--- 487,495 ----
          (setq pe eq)))
        (nreverse nas))))
  
! ;;;;
  ;;;; Merged trees from different files
! ;;;;
  
  (defun cvs-tree-fuzzy-merge-1 (trees tree prev)
    )
***************
*** 509,515 ****
        (erase-buffer)
        (let ((cvs-tag-print-rev nil))
        (cvs-tree-print tree 'cvs-tag->string 3)))))
!       
  
  (provide 'cvs-status)
  
--- 509,515 ----
        (erase-buffer)
        (let ((cvs-tag-print-rev nil))
        (cvs-tree-print tree 'cvs-tag->string 3)))))
! 
  
  (provide 'cvs-status)