Update yaoddmuse with merged code from emacswiki.