Mercurial > emacs
comparison lisp/vc-cvs.el @ 91327:606f2d163a64
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 09 Jan 2008 01:21:15 +0000 |
parents | c938ab6810a4 107ccd98fa12 |
children | c70e45a7acfd |
comparison
equal
deleted
inserted
replaced
91326:b1a63d7fa09c | 91327:606f2d163a64 |
---|---|
1 ;;; vc-cvs.el --- non-resident support for CVS version-control | 1 ;;; vc-cvs.el --- non-resident support for CVS version-control |
2 | 2 |
3 ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, | 3 ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, |
4 ;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc. | 4 ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
5 | 5 |
6 ;; Author: FSF (see vc.el for full credits) | 6 ;; Author: FSF (see vc.el for full credits) |
7 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 7 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
8 | 8 |
9 ;; $Id$ | 9 ;; $Id$ |
646 tmp)))) | 646 tmp)))) |
647 (put-text-property | 647 (put-text-property |
648 bol (1+ bol) 'vc-cvs-annotate-time | 648 bol (1+ bol) 'vc-cvs-annotate-time |
649 (setq cache (cons | 649 (setq cache (cons |
650 ;; Position at end makes for nicer overlay result. | 650 ;; Position at end makes for nicer overlay result. |
651 (match-end 0) | 651 ;; Don't put actual buffer pos here, but only relative |
652 ;; distance, so we don't ever move backward in the | |
653 ;; goto-char below, even if the text is moved. | |
654 (- (match-end 0) (match-beginning 0)) | |
652 (vc-annotate-convert-time | 655 (vc-annotate-convert-time |
653 (encode-time 0 0 0 day month year)))))))) | 656 (encode-time 0 0 0 day month year)))))))) |
654 (when cache | 657 (when cache |
655 (goto-char (car cache)) ; fontify from here to eol | 658 (goto-char (+ bol (car cache))) ; Fontify from here to eol. |
656 (cdr cache)))) ; days (float) | 659 (cdr cache)))) ; days (float) |
657 | 660 |
658 (defun vc-cvs-annotate-extract-revision-at-line () | 661 (defun vc-cvs-annotate-extract-revision-at-line () |
659 (save-excursion | 662 (save-excursion |
660 (beginning-of-line) | 663 (beginning-of-line) |