[Emacs-diffs] /srv/bzr/emacs/trunk r104816: Prevent Gnus from loading PGG.

[Daiki Ueno]

------------------------------------------------------------
revno: 104816
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-01 05:54:35 +0900
message:
  Prevent Gnus from loading PGG.
  
  * mml2015.el (mml2015-use): Don't try to load PGG on Emacs 24, when EPG
  is not fully working.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mml2015.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-06-30 14:25:27 +0000
+++ b/lisp/gnus/ChangeLog       2011-06-30 20:54:35 +0000
@@ -1,3 +1,8 @@
+2011-06-30  Daiki Ueno  <address@hidden>
+
+       * mml2015.el (mml2015-use): Don't try to load PGG on Emacs 24, when EPG
+       is not fully working.
+
 2011-06-30  Andrew Cohen  <address@hidden>
 
        * gnus-art.el (gnus-request-article-this-buffer): Use existing function

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2011-02-12 01:31:35 +0000
+++ b/lisp/gnus/mml2015.el      2011-06-30 20:54:35 +0000
@@ -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)