/[emacs]/emacs/lisp/gnus/mml2015.el
ViewVC logotype

Diff of /emacs/lisp/gnus/mml2015.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.4 by miles, Mon Nov 1 23:06:34 2004 UTC revision 1.5 by kfstorm, Wed Feb 9 15:50:37 2005 UTC
# Line 83  Line 83 
83      ("TRUST_FULLY"     . t)      ("TRUST_FULLY"     . t)
84      ("TRUST_ULTIMATE"  . t))      ("TRUST_ULTIMATE"  . t))
85    "Map GnuPG trust output values to a boolean saying if you trust the key."    "Map GnuPG trust output values to a boolean saying if you trust the key."
86    :version "21.4"    :version "22.1"
87    :group 'mime-security    :group 'mime-security
88    :type '(repeat (cons (regexp :tag "GnuPG output regexp")    :type '(repeat (cons (regexp :tag "GnuPG output regexp")
89                         (boolean :tag "Trust key"))))                         (boolean :tag "Trust key"))))
# Line 585  Line 585 
585          ;; set up a function to call the correct gpg encrypt routine          ;; set up a function to call the correct gpg encrypt routine
586          ;; with the right arguments. (FIXME: this should be done          ;; with the right arguments. (FIXME: this should be done
587          ;; differently.)          ;; differently.)
588          (flet ((gpg-encrypt-func          (flet ((gpg-encrypt-func
589                   (sign plaintext ciphertext result recipients &optional                   (sign plaintext ciphertext result recipients &optional
590                         passphrase sign-with-key armor textmode)                         passphrase sign-with-key armor textmode)
591                   (if sign                   (if sign
# Line 656  Line 656 
656          (if (condition-case err          (if (condition-case err
657                  (prog1                  (prog1
658                      (pgg-decrypt-region (point-min) (point-max))                      (pgg-decrypt-region (point-min) (point-max))
659                    (setq decrypt-status                    (setq decrypt-status
660                          (with-current-buffer mml2015-result-buffer                          (with-current-buffer mml2015-result-buffer
661                            (buffer-string)))                            (buffer-string)))
662                    (mm-set-handle-multipart-parameter                    (mm-set-handle-multipart-parameter
# Line 740  Line 740 
740            (mm-insert-part signature))            (mm-insert-part signature))
741          (if (condition-case err          (if (condition-case err
742                  (prog1                  (prog1
743                      (pgg-verify-region (point-min) (point-max)                      (pgg-verify-region (point-min) (point-max)
744                                         signature-file t)                                         signature-file t)
745                    (goto-char (point-min))                    (goto-char (point-min))
746                    (while (search-forward "\r\n" nil t)                    (while (search-forward "\r\n" nil t)

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26