/[emacs]/emacs/lisp/cvs-status.el
ViewVC logotype

Diff of /emacs/lisp/cvs-status.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.13 by pj, Sat Jan 5 18:58:49 2002 UTC revision 1.13.4.1 by miles, Fri Apr 4 06:20:01 2003 UTC
# Line 86  Line 86 
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
# Line 218  or a string (in which case it should sim Line 218  or a string (in which case it should sim
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
# Line 487  Optional prefix ARG chooses between two Line 487  Optional prefix ARG chooses between two
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    )    )
# Line 509  Optional prefix ARG chooses between two Line 509  Optional prefix ARG chooses between two
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    

Legend:
Removed from v.1.13  
changed lines
  Added in v.1.13.4.1

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26