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

A. which　　　　　　　　　　　 B. that　　　　　　　　　　　　　 C. what　　　　　　　　　　　　 D. whether