Try to handle buffer/file modifications which conflict with VCS locking.

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2c6b56..fe3c252 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-06  Chong Yidong  <cyd@gnu.org>
+
+       * vc/vc.el (vc-next-action): Detect buffer modifications
+       conflicting with locking VCS operation (Bug#11490).
+
+       * vc/vc-hooks.el (vc-after-save): DTRT for locking VCSes.
+
 2013-01-05  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls):