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

[Miles Bader]

Index: emacs/lisp/gnus/mml2015.el
diff -c emacs/lisp/gnus/mml2015.el:1.8 emacs/lisp/gnus/mml2015.el:1.9
*** emacs/lisp/gnus/mml2015.el:1.8      Sat Aug  6 19:51:42 2005
--- emacs/lisp/gnus/mml2015.el  Sun Aug  7 23:56:33 2005
***************
*** 642,648 ****
    (autoload 'pgg-decrypt-region "pgg")
    (autoload 'pgg-verify-region "pgg")
    (autoload 'pgg-sign-region "pgg")
!   (autoload 'pgg-encrypt-region "pgg"))
  
  (defun mml2015-pgg-decrypt (handle ctl)
    (catch 'error
--- 642,649 ----
    (autoload 'pgg-decrypt-region "pgg")
    (autoload 'pgg-verify-region "pgg")
    (autoload 'pgg-sign-region "pgg")
!   (autoload 'pgg-encrypt-region "pgg")
!   (autoload 'pgg-parse-armor "pgg-parse"))
  
  (defun mml2015-pgg-decrypt (handle ctl)
    (catch 'error
***************
*** 810,824 ****
    (let ((pgg-errors-buffer mml2015-result-buffer)
        (boundary (mml-compute-boundary cont))
        (pgg-default-user-id (or (message-options-get 'mml-sender)
!                                pgg-default-user-id)))
      (unless (pgg-sign-region (point-min) (point-max))
        (pop-to-buffer mml2015-result-buffer)
        (error "Sign error"))
      (goto-char (point-min))
      (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n"
                    boundary))
!       ;;; FIXME: what is the micalg?
!     (insert "\tmicalg=pgp-sha1; protocol=\"application/pgp-signature\"\n")
      (insert (format "\n--%s\n" boundary))
      (goto-char (point-max))
      (insert (format "\n--%s\n" boundary))
--- 811,833 ----
    (let ((pgg-errors-buffer mml2015-result-buffer)
        (boundary (mml-compute-boundary cont))
        (pgg-default-user-id (or (message-options-get 'mml-sender)
!                                pgg-default-user-id))
!       entry)
      (unless (pgg-sign-region (point-min) (point-max))
        (pop-to-buffer mml2015-result-buffer)
        (error "Sign error"))
      (goto-char (point-min))
      (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n"
                    boundary))
!     (if (setq entry (assq 2 (pgg-parse-armor
!                            (with-current-buffer pgg-output-buffer
!                              (buffer-string)))))
!       (setq entry (assq 'hash-algorithm (cdr entry))))
!     (insert (format "\tmicalg=%s; "
!                   (if (cdr entry)
!                       (downcase (format "pgp-%s" (cdr entry)))
!                     "pgp-sha1")))
!     (insert "protocol=\"application/pgp-signature\"\n")
      (insert (format "\n--%s\n" boundary))
      (goto-char (point-max))
      (insert (format "\n--%s\n" boundary))