Re: patch to include EasyPG to Emacs

[Daiki Ueno <ueno@unixuser.org>]

Michael Olson <mwolson@gnu.org> writes:

> Applied, with typo fix.

Thanks.  And sorry for bothering you again and again, could you rename
epa-mail-minor-mode with epa-global-mail-mode (from Stefan's choices)?
Here is a patch.

Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12752
diff -c -r1.12752 ChangeLog
*** lisp/ChangeLog	10 Feb 2008 20:57:45 -0000	1.12752
--- lisp/ChangeLog	10 Feb 2008 21:18:33 -0000
***************
*** 6,12 ****
  	(epg-bug-report-address): New constant.
  
  	* epa-mail.el (epa-mail-mode): Add autoload cookie.
! 	(epa-mail-minor-mode): New global minor mode.
  
  	* epa-file.el (epa-file-mode): New global minor mode.
  
--- 6,12 ----
  	(epg-bug-report-address): New constant.
  
  	* epa-mail.el (epa-mail-mode): Add autoload cookie.
! 	(epa-global-mail-mode): New global minor mode.
  
  	* epa-file.el (epa-file-mode): New global minor mode.
  
Index: lisp/epa-mail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epa-mail.el,v
retrieving revision 1.3
diff -c -r1.3 epa-mail.el
*** lisp/epa-mail.el	10 Feb 2008 20:57:47 -0000	1.3
--- lisp/epa-mail.el	10 Feb 2008 21:18:34 -0000
***************
*** 175,185 ****
    (epa-import-armor-in-region (point-min) (point-max)))
  
  ;;;###autoload
! (define-minor-mode epa-mail-minor-mode
    "Minor mode to hook EasyPG into Mail mode."
    :global t :init-value nil :group 'epa-mail :version "23.1"
    (remove-hook 'mail-mode-hook 'epa-mail-mode)
!   (if epa-mail-minor-mode
        (add-hook 'mail-mode-hook 'epa-mail-mode)))
  
  (provide 'epa-mail)
--- 175,185 ----
    (epa-import-armor-in-region (point-min) (point-max)))
  
  ;;;###autoload
! (define-minor-mode epa-global-mail-mode
    "Minor mode to hook EasyPG into Mail mode."
    :global t :init-value nil :group 'epa-mail :version "23.1"
    (remove-hook 'mail-mode-hook 'epa-mail-mode)
!   (if epa-global-mail-mode
        (add-hook 'mail-mode-hook 'epa-mail-mode)))
  
  (provide 'epa-mail)
Index: lisp/epa.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epa.el,v
retrieving revision 1.4
diff -c -r1.4 epa.el
*** lisp/epa.el	10 Feb 2008 20:57:47 -0000	1.4
--- lisp/epa.el	10 Feb 2008 21:18:34 -0000
***************
*** 47,53 ****
  
  (defcustom epa-global-minor-modes '(epa-dired-mode
  				    epa-file-mode
! 				    epa-mail-minor-mode
  				    epa-menu-mode)
    "Globally defined minor modes to hook into other modes."
    :type '(repeat symbol)
--- 47,53 ----
  
  (defcustom epa-global-minor-modes '(epa-dired-mode
  				    epa-file-mode
! 				    epa-global-mail-mode
  				    epa-menu-mode)
    "Globally defined minor modes to hook into other modes."
    :type '(repeat symbol)

Regards,
-- 
Daiki Ueno