[Emacs-diffs] Changes to emacs/lisp/gnus/mml2015.el

[Kim F . Storm]

Index: emacs/lisp/gnus/mml2015.el
diff -c emacs/lisp/gnus/mml2015.el:1.4 emacs/lisp/gnus/mml2015.el:1.5
*** emacs/lisp/gnus/mml2015.el:1.4      Mon Nov  1 23:06:34 2004
--- emacs/lisp/gnus/mml2015.el  Wed Feb  9 15:50:37 2005
***************
*** 83,89 ****
      ("TRUST_FULLY"     . t)
      ("TRUST_ULTIMATE"  . t))
    "Map GnuPG trust output values to a boolean saying if you trust the key."
!   :version "21.4"
    :group 'mime-security
    :type '(repeat (cons (regexp :tag "GnuPG output regexp")
                       (boolean :tag "Trust key"))))
--- 83,89 ----
      ("TRUST_FULLY"     . t)
      ("TRUST_ULTIMATE"  . t))
    "Map GnuPG trust output values to a boolean saying if you trust the key."
!   :version "22.1"
    :group 'mime-security
    :type '(repeat (cons (regexp :tag "GnuPG output regexp")
                       (boolean :tag "Trust key"))))
***************
*** 585,591 ****
        ;; set up a function to call the correct gpg encrypt routine
        ;; with the right arguments. (FIXME: this should be done
        ;; differently.)
!       (flet ((gpg-encrypt-func 
                 (sign plaintext ciphertext result recipients &optional
                       passphrase sign-with-key armor textmode)
                 (if sign
--- 585,591 ----
        ;; set up a function to call the correct gpg encrypt routine
        ;; with the right arguments. (FIXME: this should be done
        ;; differently.)
!       (flet ((gpg-encrypt-func
                 (sign plaintext ciphertext result recipients &optional
                       passphrase sign-with-key armor textmode)
                 (if sign
***************
*** 656,662 ****
        (if (condition-case err
                (prog1
                    (pgg-decrypt-region (point-min) (point-max))
!                 (setq decrypt-status 
                        (with-current-buffer mml2015-result-buffer
                          (buffer-string)))
                  (mm-set-handle-multipart-parameter
--- 656,662 ----
        (if (condition-case err
                (prog1
                    (pgg-decrypt-region (point-min) (point-max))
!                 (setq decrypt-status
                        (with-current-buffer mml2015-result-buffer
                          (buffer-string)))
                  (mm-set-handle-multipart-parameter
***************
*** 740,746 ****
          (mm-insert-part signature))
        (if (condition-case err
                (prog1
!                   (pgg-verify-region (point-min) (point-max) 
                                       signature-file t)
                  (goto-char (point-min))
                  (while (search-forward "\r\n" nil t)
--- 740,746 ----
          (mm-insert-part signature))
        (if (condition-case err
                (prog1
!                   (pgg-verify-region (point-min) (point-max)
                                       signature-file t)
                  (goto-char (point-min))
                  (while (search-forward "\r\n" nil t)