Mercurial > emacs
comparison lisp/mail/mailabbrev.el @ 77664:f79d4df148cb
(sendmail-pre-abbrev-expand-hook):
Don't include non-self-insert commands in the exception for `-'.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 08 May 2007 18:15:07 +0000 |
| parents | e3694f1cb928 |
| children | 8e27d63c45eb d7172f202ab8 |
comparison
equal
deleted
inserted
replaced
| 77663:32334cd7302e | 77664:f79d4df148cb |
|---|---|
| 492 ;; then don't expand the abbrev now (that is, don't expand | 492 ;; then don't expand the abbrev now (that is, don't expand |
| 493 ;; when the user types -.) Check the character's syntax in | 493 ;; when the user types -.) Check the character's syntax in |
| 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 '(?@ ?. ?% ?! ?_ ?-)))) |
| 500 (let ((pre-abbrev-expand-hook nil)) ; That's us; don't loop. | 502 (let ((pre-abbrev-expand-hook nil)) ; That's us; don't loop. |
| 501 ;; Use this table so that abbrevs can have hyphens in them. | 503 ;; Use this table so that abbrevs can have hyphens in them. |