Mercurial > emacs
changeset 80887:a0e8097f1696
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 12)
- Update from CVS
2007-05-08 Richard Stallman <rms@gnu.org>
* lisp/mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook):
Don't include non-self-insert commands in the exception for `-'.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-739
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 09 May 2007 23:47:51 +0000 |
| parents | 4f3dcd505adb (current diff) 8d4caf39c19f (diff) |
| children | 4005ed72ef83 |
| files | lisp/ChangeLog |
| diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed May 09 21:02:29 2007 +0000 +++ b/lisp/ChangeLog Wed May 09 23:47:51 2007 +0000 @@ -38,6 +38,11 @@ * progmodes/python.el (python-end-of-block): Revert last change. (python-end-of-statement): Make sure we move *forward*. +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
--- a/lisp/mail/mailabbrev.el Wed May 09 21:02:29 2007 +0000 +++ b/lisp/mail/mailabbrev.el Wed May 09 23:47:51 2007 +0000 @@ -494,6 +494,8 @@ ;; 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 '(?@ ?. ?% ?! ?_ ?-))))