[Emacs-commit] emacs/lisp vc.el vc-svn.el vc-arch.el smerge-mo...

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/01/14 07:38:06

Modified files:
        lisp           : vc.el vc-svn.el vc-arch.el smerge-mode.el 
                         pcvs.el ChangeLog 

Log message:
        * smerge-mode.el (smerge-auto): New function.
        * vc-svn.el (vc-svn-find-file-hook):
        * vc-arch.el (vc-arch-find-file-hook):
        * pcvs.el (cvs-revert-if-needed):
        * vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode.
        (top-level): Add a Todo list.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.512&r2=1.513
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-svn.el?cvsroot=emacs&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-arch.el?cvsroot=emacs&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/pcvs.el?cvsroot=emacs&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.12569&r2=1.12570