updated for version 7.4.031
Problem:    ":diffoff!" resets options even when 'diff' is not set. (Charles
	    Cooper)
Solution:   Only resets related options in a window where 'diff' is set.
Added tag v7-4-031 for changeset b21b5dcdca21
Merge with master.
Auto version upgrade (7.4.031)