From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 8 May 2007 18:15:58 +0000 (+0000)
Subject: (sendmail-pre-abbrev-expand-hook):
X-Git-Tag: emacs-pretest-22.0.990~66
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=75dcf19e449ab2838b29f2cd07fdb20c26c95f4d;p=emacs.git

(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 be19004e954..fc66478ebee 100644
--- 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 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 '(?@ ?. ?% ?! ?_ ?-))))