HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de
[bpt/emacs.git]
/
lisp
/
vc
/
log-view.el
diff --git
a/lisp/vc/log-view.el
b/lisp/vc/log-view.el
index
9f6ad19
..
d345a20
100644
(file)
--- a/
lisp/vc/log-view.el
+++ b/
lisp/vc/log-view.el
@@
-1,6
+1,6
@@
;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output -*- lexical-binding: t -*-
;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output -*- lexical-binding: t -*-
-;; Copyright (C) 1999-201
1
Free Software Foundation, Inc.
+;; Copyright (C) 1999-201
2
Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: rcs, sccs, cvs, log, vc, tools
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: rcs, sccs, cvs, log, vc, tools
@@
-376,6
+376,8
@@
log entries."
marked-list)))
(defun log-view-toggle-entry-display ()
marked-list)))
(defun log-view-toggle-entry-display ()
+ "If possible, expand the current Log View entry.
+This calls `log-view-expanded-log-entry-function' to do the work."
(interactive)
;; Don't do anything unless `log-view-expanded-log-entry-function'
;; is defined in this mode.
(interactive)
;; Don't do anything unless `log-view-expanded-log-entry-function'
;; is defined in this mode.
@@
-419,10
+421,10
@@
It assumes that a log entry starts with a line matching
(if (or (null arg) (zerop arg))
(setq arg 1))
(if (< arg 0)
(if (or (null arg) (zerop arg))
(setq arg 1))
(if (< arg 0)
- (dotimes (n (- arg))
+ (dotimes (
_
n (- arg))
(log-view-end-of-defun))
(catch 'beginning-of-buffer
(log-view-end-of-defun))
(catch 'beginning-of-buffer
- (dotimes (n arg)
+ (dotimes (
_
n arg)
(or (log-view-current-entry nil t)
(throw 'beginning-of-buffer nil)))
(point))))
(or (log-view-current-entry nil t)
(throw 'beginning-of-buffer nil)))
(point))))
@@
-559,9
+561,6
@@
changeset that affected the currently considered file(s)."
log-view-vc-fileset))
to fr)))
log-view-vc-fileset))
to fr)))
-(declare-function vc-diff-internal "vc"
- (async vc-fileset rev1 rev2 &optional verbose))
-
(defun log-view-diff-changeset (beg end)
"Get the diff between two revisions.
If the mark is not active or the mark is on the revision at point,
(defun log-view-diff-changeset (beg end)
"Get the diff between two revisions.
If the mark is not active or the mark is on the revision at point,