mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

Prevent Gnus from loading PGG.

Browse source 
* mml2015.el (mml2015-use): Don't try to load PGG on Emacs 24, when EPG
is not fully working.
This commit is contained in:
Daiki Ueno 2011-07-01 05:54:35 +09:00
parent b14c0c5545
commit 9ccd6e90d6
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/gnus/ChangeLog
View file

@ -1,3 +1,8 @@
2011-06-30 Daiki Ueno <ueno@unixuser.org>
* mml2015.el (mml2015-use): Don't try to load PGG on Emacs 24, when EPG
is not fully working.
2011-06-30 Andrew Cohen <cohen@andy.bu.edu>
* gnus-art.el (gnus-request-article-this-buffer): Use existing function

12
lisp/gnus/mml2015.el
View file

@ -55,9 +55,15 @@
'epg)
(error))
(progn
(ignore-errors (require 'pgg))
(and (fboundp 'pgg-sign-region)
'pgg))
(let ((abs-file (locate-library "pgg")))
;; Don't load PGG if it is marked as obsolete
;; (Emacs 24).
(when (and abs-file
(not (string-match-p "/obsolete/[^/]*\\'"
abs-file)))
(ignore-errors (require 'pgg))
(and (fboundp 'pgg-sign-region)
'pgg))))
(progn (ignore-errors
(load "mc-toplev"))
(and (fboundp 'mc-encrypt-generic)