Mercurial > emacs
comparison lisp/vc/vc.el @ 109416:c3ebf31421b2
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 24 Jun 2010 22:51:08 +0000 |
| parents | e93288477c43 50dd8d98f75b |
| children | 810852b2385b |
comparison
equal
deleted
inserted
replaced
| 109415:5922ae6fb6dc | 109416:c3ebf31421b2 |
|---|---|
| 1545 ;; Treat this case specially so as not to pop the buffer. | 1545 ;; Treat this case specially so as not to pop the buffer. |
| 1546 (progn | 1546 (progn |
| 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. |
| 1553 (setq buffer-read-only t) | 1556 (setq buffer-read-only t) |
| 1554 (vc-exec-after `(vc-diff-finish ,(current-buffer) ',(when verbose | 1557 (vc-exec-after `(vc-diff-finish ,(current-buffer) ',(when verbose |