Along with the letter was his promise _____ he would visit me this coming Christmas.　　 [上海2004春]

A. which　　　 　 　B. that　　　　　　

C. what　　　　 　 　D. whether