diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/mail/mailabbrev.el | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index be19004e954..fc66478ebee 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-05-08 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook): | ||
| 4 | Don't include non-self-insert commands in the exception for `-'. | ||
| 5 | |||
| 1 | 2007-05-08 David Reitter <david.reitter@gmail.com> | 6 | 2007-05-08 David Reitter <david.reitter@gmail.com> |
| 2 | 7 | ||
| 3 | * progmodes/python.el (python-guess-indent): Check non-nullness | 8 | * 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.") | |||
| 494 | ;; the usual syntax table. | 494 | ;; the usual syntax table. |
| 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. | ||
| 498 | (equal this-command 'self-insert) | ||
| 497 | (or (eq (char-syntax last-command-char) ?_) | 499 | (or (eq (char-syntax last-command-char) ?_) |
| 498 | ;; Don't expand on @. | 500 | ;; Don't expand on @. |
| 499 | (memq last-command-char '(?@ ?. ?% ?! ?_ ?-)))) | 501 | (memq last-command-char '(?@ ?. ?% ?! ?_ ?-)))) |