diff options
| author | Chong Yidong | 2011-06-26 00:05:39 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-06-26 00:05:39 -0400 |
| commit | 2afef60a03c32cd6a9db697f12d6284b2b41415a (patch) | |
| tree | 4aa579ee89fca6ec9eca71d31e66128effb1f274 /lisp/ChangeLog | |
| parent | 5fdd4046b937d06b695fb8794ec1cdeb46bdfd8f (diff) | |
| download | emacs-2afef60a03c32cd6a9db697f12d6284b2b41415a.tar.gz emacs-2afef60a03c32cd6a9db697f12d6284b2b41415a.zip | |
New option for showing a diff in vc-revert (Bug#8927).
* vc/vc.el (vc-revert-show-diff): New defcustom.
(vc-diff-internal): New arg specifying diff buffer.
(vc-revert): Obey vc-revert-show-diff. If we show a diff, don't
reuse an existing *vc-diff* buffer.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dd0c187759e..81f0eaa723a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2011-06-26 Chong Yidong <cyd@stupidchicken.com> | 1 | 2011-06-26 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * vc/vc.el (vc-revert-show-diff): New defcustom. | ||
| 4 | (vc-diff-internal): New arg specifying diff buffer. | ||
| 5 | (vc-revert): Obey vc-revert-show-diff. If we show a diff, don't | ||
| 6 | reuse an existing *vc-diff* buffer (Bug#8927). | ||
| 7 | |||
| 3 | * progmodes/cperl-mode.el (cperl-mode): Derive from prog-mode. | 8 | * progmodes/cperl-mode.el (cperl-mode): Derive from prog-mode. |
| 4 | 9 | ||
| 5 | 2011-06-26 Glenn Morris <rgm@gnu.org> | 10 | 2011-06-26 Glenn Morris <rgm@gnu.org> |