[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/02/16 15:54:39

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -b -r1.532 -r1.533
--- vc.el       14 Feb 2008 07:37:49 -0000      1.532
+++ vc.el       16 Feb 2008 15:54:36 -0000      1.533
@@ -3684,7 +3684,7 @@
                  vc-annotate-display-mode))))
 
 ;;;###autoload
-(defun vc-annotate (file rev &optional display-mode buf)
+(defun vc-annotate (file rev &optional display-mode buf move-point-to)
   "Display the edit history of the current file using colors.
 
 This command creates a buffer that shows, for each line of the current
@@ -3703,6 +3703,8 @@
 over the past 20 days are shown in red to blue, according to their
 age, and everything that is older than that is shown in blue.
 
+If MOVE-POINT-TO is given, move the point to that line.
+
 Customization variables:
 
 `vc-annotate-menu-elements' customizes the menu elements of the
@@ -3730,7 +3732,7 @@
          ;; If BUF is specified, we presume the caller maintains current line,
          ;; so we don't need to do it here.  This implementation may give
          ;; strange results occasionally in the case of REV != WORKFILE-REV.
-         (current-line (unless buf (line-number-at-pos))))
+         (current-line (or move-point-to (unless buf (line-number-at-pos)))))
     (message "Annotating...")
     ;; If BUF is specified it tells in which buffer we should put the
     ;; annotations.  This is used when switching annotations to another
@@ -3898,10 +3900,12 @@
       (when newrev
        (vc-annotate vc-annotate-parent-file newrev
                      vc-annotate-parent-display-mode
-                     buf)
-       (goto-line (min oldline (progn (goto-char (point-max))
+                     buf
+                    ;; Pass the current line so that vc-annotate will
+                    ;; place the point in the line.
+                    (min oldline (progn (goto-char (point-max))
                                       (forward-line -1)
-                                      (line-number-at-pos))) buf)))))
+                                          (line-number-at-pos))))))))
 
 (defun vc-annotate-compcar (threshold a-list)
   "Test successive cons cells of A-LIST against THRESHOLD.