Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 12) - Update from CVS 2007-05-08 Richard Stallman <rms@gnu.org> * lisp/mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook): Don't include non-self-insert commands in the exception for `-'. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-739