[Emacs-commit] emacs/lisp vc.el vc-svn.el vc-hooks.el vc-cvs.e...

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/04/10 07:32:27

Modified files:
        lisp           : vc.el vc-svn.el vc-hooks.el vc-cvs.el ChangeLog 

Log message:
        * vc-hooks.el (vc-state): Add new state `conflict'.
        (vc-after-save): Use when not if.
        (vc-default-mode-line-string): Deal with the conflict state.
        (vc-prefix-map):
        (vc-menu-map): Bind vc-status instead of vc-directory.
        
        * vc.el (vc-editable-p):
        (vc-default-status-printer):
        (vc-next-action): Deal with the conflict state.
        (vc-mark-resolved): New function.
        (vc-status-mode): Fix mode name.
        (vc-default-comment-history): Use when not if.
        (Todo): Add new entries, remove old ones.
        
        * vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state.
        (vc-cvs-parse-status):
        (vc-cvs-after-dir-status):
        * vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
        Detect the conflict state.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.575&r2=1.576
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-svn.el?cvsroot=emacs&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-hooks.el?cvsroot=emacs&r1=1.235&r2=1.236
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-cvs.el?cvsroot=emacs&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.13407&r2=1.13408