Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 12)

   - Update from CVS

2007-05-08  Richard M. 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

2 files changed, 7 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 298684782ed..cb23ed22fbc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -38,6 +38,11 @@
         * progmodes/python.el (python-end-of-block): Revert last change.
         (python-end-of-statement): Make sure we move *forward*.
 
+2007-05-08  Richard Stallman  <rms@gnu.org>
+
+        * mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook):
+        Don't include non-self-insert commands in the exception for `-'.
+
 2007-05-08  David Reitter  <david.reitter@gmail.com>
 
         * progmodes/python.el (python-guess-indent): Check non-nullness
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index c62cba4822d..b83b3864cb4 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -494,6 +494,8 @@ of a mail alias.  The value is set up, buffer-local, when first needed.")
              ;; the usual syntax table.
 
              (or (and (integerp last-command-char)
+                      ;; Some commands such as M-> may want to expand first.
+                      (equal this-command 'self-insert)
                       (or (eq (char-syntax last-command-char) ?_)
                           ;; Don't expand on @.
                           (memq last-command-char '(?@ ?. ?% ?! ?_ ?-))))