Fix merge error on emacsbug.el ("prompt-properties")
Reported by Robert Goldman