[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/16 06:23:01

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

Log message:
        * smerge-mode.el (smerge-start-session): Rename from smerge-auto.
        * pcvs.el (cvs-revert-if-needed):
        * vc.el (vc-maybe-resolve-conflicts): Rename callers.
        
        * vc-svn.el (vc-svn-find-file-hook):
        * vc-arch.el (vc-arch-find-file-hook): Undo previous change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc.el?cvsroot=emacs&r1=1.513&r2=1.514
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-svn.el?cvsroot=emacs&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-arch.el?cvsroot=emacs&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/pcvs.el?cvsroot=emacs&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.12581&r2=1.12582