* lisp/subr.el (locate-user-emacs-file): If both old and new name exist, use