86 |
(1 font-lock-function-name-face))))) |
(1 font-lock-function-name-face))))) |
87 |
(defconst cvs-status-font-lock-defaults |
(defconst cvs-status-font-lock-defaults |
88 |
'(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t))) |
'(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t))) |
89 |
|
|
90 |
|
|
91 |
(put 'cvs-status-mode 'mode-class 'special) |
(put 'cvs-status-mode 'mode-class 'special) |
92 |
;;;###autoload |
;;;###autoload |
218 |
A tag cannot be a CONS. The return value can also be a list of strings, |
A tag cannot be a CONS. The return value can also be a list of strings, |
219 |
if several nodes where merged into one. |
if several nodes where merged into one. |
220 |
The tree will be printed no closer than column COLUMN." |
The tree will be printed no closer than column COLUMN." |
221 |
|
|
222 |
(let* ((eol (save-excursion (end-of-line) (current-column))) |
(let* ((eol (save-excursion (end-of-line) (current-column))) |
223 |
(column (max (+ eol 2) column))) |
(column (max (+ eol 2) column))) |
224 |
(if (null tags) column |
(if (null tags) column |
487 |
(setq pe eq))) |
(setq pe eq))) |
488 |
(nreverse nas)))) |
(nreverse nas)))) |
489 |
|
|
490 |
;;;; |
;;;; |
491 |
;;;; Merged trees from different files |
;;;; Merged trees from different files |
492 |
;;;; |
;;;; |
493 |
|
|
494 |
(defun cvs-tree-fuzzy-merge-1 (trees tree prev) |
(defun cvs-tree-fuzzy-merge-1 (trees tree prev) |
495 |
) |
) |
509 |
(erase-buffer) |
(erase-buffer) |
510 |
(let ((cvs-tag-print-rev nil)) |
(let ((cvs-tag-print-rev nil)) |
511 |
(cvs-tree-print tree 'cvs-tag->string 3))))) |
(cvs-tree-print tree 'cvs-tag->string 3))))) |
512 |
|
|
513 |
|
|
514 |
(provide 'cvs-status) |
(provide 'cvs-status) |
515 |
|
|