Mercurial > emacs
comparison lisp/cvs-status.el @ 49588:37645a051842
Trailing whitespace deleted.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 04 Feb 2003 11:26:42 +0000 |
| parents | c450330ea833 |
| children | 695cf19ef79e d7ddb3e565de |
comparison
equal
deleted
inserted
replaced
| 49587:e82b3fe06d4c | 49588:37645a051842 |
|---|---|
| 84 (progn (re-search-backward cvs-status-tags-leader-re nil t) | 84 (progn (re-search-backward cvs-status-tags-leader-re nil t) |
| 85 (forward-line 1)) | 85 (forward-line 1)) |
| 86 (1 font-lock-function-name-face))))) | 86 (1 font-lock-function-name-face))))) |
| 87 (defconst cvs-status-font-lock-defaults | 87 (defconst cvs-status-font-lock-defaults |
| 88 '(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t))) | 88 '(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t))) |
| 89 | 89 |
| 90 | 90 |
| 91 (put 'cvs-status-mode 'mode-class 'special) | 91 (put 'cvs-status-mode 'mode-class 'special) |
| 92 ;;;###autoload | 92 ;;;###autoload |
| 93 (define-derived-mode cvs-status-mode fundamental-mode "CVS-Status" | 93 (define-derived-mode cvs-status-mode fundamental-mode "CVS-Status" |
| 94 "Mode used for cvs status output." | 94 "Mode used for cvs status output." |
| 216 PRINTER should accept both a tag (in which case it should return a string) | 216 PRINTER should accept both a tag (in which case it should return a string) |
| 217 or a string (in which case it should simply return its argument). | 217 or a string (in which case it should simply return its argument). |
| 218 A tag cannot be a CONS. The return value can also be a list of strings, | 218 A tag cannot be a CONS. The return value can also be a list of strings, |
| 219 if several nodes where merged into one. | 219 if several nodes where merged into one. |
| 220 The tree will be printed no closer than column COLUMN." | 220 The tree will be printed no closer than column COLUMN." |
| 221 | 221 |
| 222 (let* ((eol (save-excursion (end-of-line) (current-column))) | 222 (let* ((eol (save-excursion (end-of-line) (current-column))) |
| 223 (column (max (+ eol 2) column))) | 223 (column (max (+ eol 2) column))) |
| 224 (if (null tags) column | 224 (if (null tags) column |
| 225 ;;(move-to-column-force column) | 225 ;;(move-to-column-force column) |
| 226 (let* ((rev (cvs-car tags)) | 226 (let* ((rev (cvs-car tags)) |
| 485 (insert (cdr na+char)) | 485 (insert (cdr na+char)) |
| 486 (push (car na+char) nas)) | 486 (push (car na+char) nas)) |
| 487 (setq pe eq))) | 487 (setq pe eq))) |
| 488 (nreverse nas)))) | 488 (nreverse nas)))) |
| 489 | 489 |
| 490 ;;;; | 490 ;;;; |
| 491 ;;;; Merged trees from different files | 491 ;;;; Merged trees from different files |
| 492 ;;;; | 492 ;;;; |
| 493 | 493 |
| 494 (defun cvs-tree-fuzzy-merge-1 (trees tree prev) | 494 (defun cvs-tree-fuzzy-merge-1 (trees tree prev) |
| 495 ) | 495 ) |
| 496 | 496 |
| 497 (defun cvs-tree-fuzzy-merge (trees tree) | 497 (defun cvs-tree-fuzzy-merge (trees tree) |
| 507 (while (listp (setq tree (cvs-tags->tree (cvs-status-get-tags)))) | 507 (while (listp (setq tree (cvs-tags->tree (cvs-status-get-tags)))) |
| 508 (cvs-tree-fuzzy-merge trees tree)) | 508 (cvs-tree-fuzzy-merge trees tree)) |
| 509 (erase-buffer) | 509 (erase-buffer) |
| 510 (let ((cvs-tag-print-rev nil)) | 510 (let ((cvs-tag-print-rev nil)) |
| 511 (cvs-tree-print tree 'cvs-tag->string 3))))) | 511 (cvs-tree-print tree 'cvs-tag->string 3))))) |
| 512 | 512 |
| 513 | 513 |
| 514 (provide 'cvs-status) | 514 (provide 'cvs-status) |
| 515 | 515 |
| 516 ;;; cvs-status.el ends here | 516 ;;; cvs-status.el ends here |