Merge branch 'master' of https://git.gnus.org/gnus

[gnus] / lisp / mml2015.el

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index f966e5e..675cafe 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -56,11 +56,7 @@
                           'epg)
                       (error))
                     (progn
-                      (ignore-errors
-                       ;; Avoid the "Recursive load suspected" error
-                       ;; in Emacs 21.1.
-                       (let ((recursive-load-depth-limit 100))
-                         (require 'pgg)))
+                      (ignore-errors (require 'pgg))
                       (and (fboundp 'pgg-sign-region)
                            'pgg))
                     (progn (ignore-errors
@@ -223,6 +219,25 @@ Whether the passphrase is cached at all is controlled by
          handles
        (list handles)))))
 
+(defun mml2015-gpg-pretty-print-fpr (fingerprint)
+  (let* ((result "")
+        (fpr-length (string-width fingerprint))
+        (n-slice 0)
+        slice)
+    (setq fingerprint (string-to-list fingerprint))
+    (while fingerprint
+      (setq fpr-length (- fpr-length 4))
+      (setq slice (butlast fingerprint fpr-length))
+      (setq fingerprint (nthcdr 4 fingerprint))
+      (setq n-slice (1+ n-slice))
+      (setq result
+           (concat
+            result
+            (case n-slice
+              (1  slice)
+              (otherwise (concat " " slice))))))
+    result))
+
 (defun mml2015-gpg-extract-signature-details ()
   (goto-char (point-min))
   (let* ((expired (re-search-forward