]> git.eshelyaron.com Git - emacs.git/commit
(vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
authorAndré Spiegel <spiegel@gnu.org>
Fri, 18 Aug 1995 20:22:53 +0000 (20:22 +0000)
committerAndré Spiegel <spiegel@gnu.org>
Fri, 18 Aug 1995 20:22:53 +0000 (20:22 +0000)
commit04446ed0c2cd9c5e4cfcac0e3be5bb49090762fb
treee5d75ba625083cf0dda5b8de1b94327a20b4ca1f
parent361b7640072e3c34e68a11f9f8765bd8716c3529
(vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
(vc-locking-user): Count cvs status `unresolved-conflict' as "locked".
(vc-checkout-model): New property and access function (still simplistic).
(vc-after-save-hook): New function.
(vc-mode-line): When the file is locked by somebody else, make the
buffer read-only.  (Formerly this was only done for root.)  Don't
write-protect the buffer if the file is unlocked.  Instead, install
vc-after-save-hook, which "locks" the file when modifications are
saved.
lisp/vc-hooks.el