mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

* lisp/vc/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal):

Browse Source 
Use derived-mode-p.  Run the diff asynchronously.
This commit is contained in:
Stefan Monnier 2012-04-10 16:08:43 -04:00
parent 6bbef4e552
commit 1930bf5dc3
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2012-04-10 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal):
Use derived-mode-p. Run the diff asynchronously.
2012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
* obsolete/mouse-sel.el: Add an Obsolete-since header.
@ -10,13 +15,13 @@
2012-04-10 Nathan Weizenbaum <nweiz@google.com>
* progmodes/python.el (python-fill-paragraph): Make
python-fill-region in a multiline string work when font-lock is
* progmodes/python.el (python-fill-paragraph):
Make python-fill-region in a multiline string work when font-lock is
disabled (bug#7018).
2012-04-10 Laimonas Vėbra <laimonas.vebra@gmail.com> (tiny change)
* language/european.el (cp775): Added oem/legacy (en)coding on
* language/european.el (cp775): Add oem/legacy (en)coding on
DOS/MS Windows for the Baltic languages. There are still plenty of
texts written in this encoding/codepage (bug#6519).
@ -27,7 +32,7 @@
2012-04-10 Florian Adamsky <florian@adamsky.it> (tiny change)
* recentf.el (recentf-dialog-mode-map): Added two keybindings for
* recentf.el (recentf-dialog-mode-map): Add two keybindings for
next-line "n" and previous-line "p" in order to make recentf more
consistent with ibuffer, dired or org-mode (bug#9387).

28
lisp/vc/vc-annotate.el
View File

@ -522,12 +522,12 @@ the file in question, search for the log entry required and move point."
(car rev-at-line) t 1)))))))
(defun vc-annotate-show-diff-revision-at-line-internal (filediff)
(if (not (equal major-mode 'vc-annotate-mode))
(if (not (derived-mode-p 'vc-annotate-mode))
(message "Cannot be invoked outside of a vc annotate buffer")
(let* ((rev-at-line (vc-annotate-extract-revision-at-line))
(prev-rev nil)
(rev (car rev-at-line))
(fname (cdr rev-at-line)))
(prev-rev nil)
(rev (car rev-at-line))
(fname (cdr rev-at-line)))
(if (not rev-at-line)
(message "Cannot extract revision number from the current line")
(setq prev-rev
@ -535,17 +535,15 @@ the file in question, search for the log entry required and move point."
(if filediff fname nil) rev))
(if (not prev-rev)
(message "Cannot diff from any revision prior to %s" rev)
(save-window-excursion
(vc-diff-internal
nil
;; The value passed here should follow what
;; `vc-deduce-fileset' returns.
(list vc-annotate-backend
(if filediff
(list fname)
nil))
prev-rev rev))
(switch-to-buffer "*vc-diff*"))))))
(vc-diff-internal
t
;; The value passed here should follow what
;; `vc-deduce-fileset' returns.
(list vc-annotate-backend
(if filediff
(list fname)
nil))
prev-rev rev))))))
(defun vc-annotate-show-diff-revision-at-line ()
"Visit the diff of the revision at line from its previous revision."