By 1536, Calvin had disengaged himself from the Roman Catholic Church and made plans to permanently leave France and go to Strasbourg. However, war had broken out between Francis I and Charles V, so Calvin decided to make a one-night detour to Geneva. ... He did so and remained in Geneva until his death May 27, 1564.