Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
bae9f9e3
Commit
bae9f9e3
authored
Feb 16, 2008
by
Dan Nicolaescu
Browse files
(vc-annotate): Add new argument.
(vc-annotate-warp-revision): Pass the current line to vc-annotate.
parent
8a7619ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
lisp/ChangeLog
lisp/ChangeLog
+3
-0
lisp/vc.el
lisp/vc.el
+10
-6
No files found.
lisp/ChangeLog
View file @
bae9f9e3
2008-02-16 Dan Nicolaescu <dann@ics.uci.edu>
* vc.el (vc-annotate): Add new argument.
(vc-annotate-warp-revision): Pass the current line to vc-annotate.
* progmodes/hideshow.el: Remove the minor-mode bookkeeping. Move
make-variable-buffer-local code after the corresponding defvar.
(hs-minor-mode-map): Define and initialize in one step.
...
...
lisp/vc.el
View file @
bae9f9e3
...
...
@@ -3684,7 +3684,7 @@ use; you may override this using the second optional arg MODE."
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 @@ should cover. For example, a time span of 20 days means that changes
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 @@ mode-specific menu. `vc-annotate-color-map' and
;; 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 @@ revision."
(
when
newrev
(
vc-annotate
vc-annotate-parent-file
newrev
vc-annotate-parent-display-mode
buf
)
(
goto-line
(
min
oldline
(
progn
(
goto-char
(
point-max
))
(
forward-line
-1
)
(
line-number-at-pos
)))
buf
)))))
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
))))))))
(
defun
vc-annotate-compcar
(
threshold
a-list
)
"Test successive cons cells of A-LIST against THRESHOLD.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment