(list-diary-entries): Split diary-display-hook into two pieces, diary-display-hook and diary-hook. If diary-display-hook is nil, use simple display. (include-other-diary-files): Set those hooks properly for other files.