(sendmail-pre-abbrev-expand-hook):

Don't include non-self-insert commands in the exception for `-'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be19004e9549236b131348a14e09d220071af476..fc66478ebee936709551e8b29afbf720d03c8d0b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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 c62cba4822d6ad54f64c65cc91abbbebd248b331..b83b3864cb42152780161064d2a1fa8743690afa 100644 (file)
--- 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 '(?@ ?. ?% ?! ?_ ?-))))