Emacs 24 changes
proper fix for Emacs 24 copied from Win8 repository
merge back e24 changes
merge
rescue