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

self-insert-command, not self-insert.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29e9027e54e990c0f812fd8b86016fee6f3c3b4c..f817d235f5710c56c5e3c85f927eb192014e5c03 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-08  Andreas Schwab  <schwab@suse.de>
+
+       * mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook): Check for
+       self-insert-command, not self-insert.
+
 2007-08-08  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/checkdoc.el (checkdoc-ispell-lisp-words): Remove `iff'.

diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index b3e2c051e7d129dc80653a280edceb9e051c761a..8862e6ca2d2d2cd143850ed63af5f62ff90f1e91 100644 (file)
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -495,7 +495,7 @@ of a mail alias.  The value is set up, buffer-local, when first needed.")
 
             (or (and (integerp last-command-char)
                      ;; Some commands such as M-> may want to expand first.
-                     (equal this-command 'self-insert)
+                     (equal this-command 'self-insert-command)
                      (or (eq (char-syntax last-command-char) ?_)
                          ;; Don't expand on @.
                          (memq last-command-char '(?@ ?. ?% ?! ?_ ?-))))