aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mail/mailabbrev.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c80c0b07cf3..9b8a5fedbee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-08-08 Andreas Schwab <schwab@suse.de>
2
3 * mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook): Check for
4 self-insert-command, not self-insert.
5
12007-08-08 Glenn Morris <rgm@gnu.org> 62007-08-08 Glenn Morris <rgm@gnu.org>
2 7
3 * emacs-lisp/eldoc.el (eldoc-get-fnsym-args-string): Make second 8 * emacs-lisp/eldoc.el (eldoc-get-fnsym-args-string): Make second
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index b3e2c051e7d..8862e6ca2d2 100644
--- 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.")
495 495
496 (or (and (integerp last-command-char) 496 (or (and (integerp last-command-char)
497 ;; Some commands such as M-> may want to expand first. 497 ;; Some commands such as M-> may want to expand first.
498 (equal this-command 'self-insert) 498 (equal this-command 'self-insert-command)
499 (or (eq (char-syntax last-command-char) ?_) 499 (or (eq (char-syntax last-command-char) ?_)
500 ;; Don't expand on @. 500 ;; Don't expand on @.
501 (memq last-command-char '(?@ ?. ?% ?! ?_ ?-)))) 501 (memq last-command-char '(?@ ?. ?% ?! ?_ ?-))))