An extended pair-correlation conjecture and primes in short intervals