fix the compatibility
Merge commit '1cec138'

Conflicts:
	.emacs.d/my-lisps/dev-setting.el