modified:   s9g-defuns.el
	modified:   s9g-set-global-keys.el
apply some patches from master