Crossover between a short-range and a long-range Ising model