comparison lisp/mail/mailabbrev.el @ 34921:fc01ec9131a8

(mail-abbrevs-enable, mail-abbrevs-disable): Use mail-mode-hook instead of mail-setup-hook. Otherwise continuing an interrupted message with C-u C-x m for instence, winds up in Mail mode without abbrevs.

34920:f3d136693fb1

;; If you would like your aliases to be expanded when you type M-> or ^N to
;; move out of the mail-header into the message body (instead of having to
;; type SPC at the end of the abbrev before moving away) then you can do
;;
;;  (add-hook
;;   'mail-setup-hook
;;   (lambda ()
;;      (substitute-key-definition 'next-line 'mail-abbrev-next-line
;;				 mail-mode-map global-map)
;;      (substitute-key-definition 'end-of-buffer 'mail-abbrev-end-of-buffer
;;				 mail-mode-map global-map)))

;; behaviour.
;;
;; Thanks to Harald Hanche-Olsen, Michael Ernst, David Loeffler, and
;; Noah Friedman for suggestions and bug reports.

;; To use this package, do (add-hook 'mail-setup-hook 'mail-abbrevs-setup).

;;; Code:

(require 'sendmail)

  (add-hook 'pre-abbrev-expand-hook 'sendmail-pre-abbrev-expand-hook
	    nil t)
  (abbrev-mode 1))

(defun mail-abbrevs-enable ()
  (add-hook 'mail-setup-hook 'mail-abbrevs-setup))

(defun mail-abbrevs-disable ()
  "Turn off use of the `mailabbrev' package."
  (remove-hook 'mail-setup-hook 'mail-abbrevs-setup)
  (abbrev-mode (if (default-value 'abbrev-mode) 1 -1)))

;;;###autoload
(defun build-mail-abbrevs (&optional file recursivep)
  "Read mail aliases from personal mail alias file and set `mail-abbrevs'.

34921:fc01ec9131a8

;; If you would like your aliases to be expanded when you type M-> or ^N to
;; move out of the mail-header into the message body (instead of having to
;; type SPC at the end of the abbrev before moving away) then you can do
;;
;;  (add-hook
;;   'mail-mode-hook
;;   (lambda ()
;;      (substitute-key-definition 'next-line 'mail-abbrev-next-line
;;				 mail-mode-map global-map)
;;      (substitute-key-definition 'end-of-buffer 'mail-abbrev-end-of-buffer
;;				 mail-mode-map global-map)))

;; behaviour.
;;
;; Thanks to Harald Hanche-Olsen, Michael Ernst, David Loeffler, and
;; Noah Friedman for suggestions and bug reports.

;; To use this package, do (add-hook 'mail-mode-hook 'mail-abbrevs-setup).

;;; Code:

(require 'sendmail)

  (add-hook 'pre-abbrev-expand-hook 'sendmail-pre-abbrev-expand-hook
	    nil t)
  (abbrev-mode 1))

(defun mail-abbrevs-enable ()
  (add-hook 'mail-mode-hook 'mail-abbrevs-setup))

(defun mail-abbrevs-disable ()
  "Turn off use of the `mailabbrev' package."
  (remove-hook 'mail-mode-hook 'mail-abbrevs-setup)
  (abbrev-mode (if (default-value 'abbrev-mode) 1 -1)))

;;;###autoload
(defun build-mail-abbrevs (&optional file recursivep)
  "Read mail aliases from personal mail alias file and set `mail-abbrevs'.