fix misunderstand in `defadvice' form.
fix modifying `load-history' behavior after renaming.
Merge branch 'develop'

Conflicts:
	erefactor.el