aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2010-06-25 00:38:07 +0300
committerJuri Linkov2010-06-25 00:38:07 +0300
commit5af72a47bb2786e2eda849682f791f932d97375f (patch)
tree62cf991e471ca894888c8883fa95aa4ee22621ce
parent8f8043160b10f68e6bf06a97acc5296e2c50a419 (diff)
downloademacs-5af72a47bb2786e2eda849682f791f932d97375f.tar.gz
emacs-5af72a47bb2786e2eda849682f791f932d97375f.zip
* lisp/vc/vc.el (vc-diff-internal): Set `revert-buffer-function'
buffer-locally to lambda that re-runs the vc diff command. (Bug#6447)
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc/vc.el3
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23d7045532c..6e19fb7b650 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12010-06-24 Juri Linkov <juri@jurta.org>
2
3 * vc/vc.el (vc-diff-internal): Set `revert-buffer-function'
4 buffer-locally to lambda that re-runs the vc diff command.
5 (Bug#6447)
6
12010-06-24 Chong Yidong <cyd@stupidchicken.com> 72010-06-24 Chong Yidong <cyd@stupidchicken.com>
2 8
3 * kmacro.el (kmacro-call-macro): Don't issue hint message if the 9 * kmacro.el (kmacro-call-macro): Don't issue hint message if the
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 0d6584fb343..ae3f6a0ed38 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1547,6 +1547,9 @@ returns t if the buffer had changes, nil otherwise."
1547 (message "%s" (cdr messages)) 1547 (message "%s" (cdr messages))
1548 nil) 1548 nil)
1549 (diff-mode) 1549 (diff-mode)
1550 (set (make-local-variable 'revert-buffer-function)
1551 `(lambda (ignore-auto noconfirm)
1552 (vc-diff-internal ,async ',vc-fileset ,rev1 ,rev2 ,verbose)))
1550 ;; Make the *vc-diff* buffer read only, the diff-mode key 1553 ;; Make the *vc-diff* buffer read only, the diff-mode key
1551 ;; bindings are nicer for read only buffers. pcl-cvs does the 1554 ;; bindings are nicer for read only buffers. pcl-cvs does the
1552 ;; same thing. 1555 ;; same thing.