changes for compatibility with emacs-HEAD