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

[Miles Bader]

Index: emacs/lisp/gnus/mml-smime.el
diff -c emacs/lisp/gnus/mml-smime.el:1.6 emacs/lisp/gnus/mml-smime.el:1.7
*** emacs/lisp/gnus/mml-smime.el:1.6    Wed Aug 31 13:08:28 2005
--- emacs/lisp/gnus/mml-smime.el        Mon Sep  5 23:58:07 2005
***************
*** 81,87 ****
    (list 'keyfile
        (if (= (length smime-keys) 1)
            (cadar smime-keys)
!         (or (let ((from (cadr (funcall gnus-extract-address-components
                                         (or (save-excursion
                                               (save-restriction
                                                 (message-narrow-to-headers)
--- 81,90 ----
    (list 'keyfile
        (if (= (length smime-keys) 1)
            (cadar smime-keys)
!         (or (let ((from (cadr (funcall (if (boundp
!                                             'gnus-extract-address-components)
!                                            gnus-extract-address-components
!                                          'mail-extract-address-components)
                                         (or (save-excursion
                                               (save-restriction
                                                 (message-narrow-to-headers)
***************
*** 107,113 ****
        (while (not result)
          (setq who (read-from-minibuffer
                     (format "%sLookup certificate for: " (or bad ""))
!                    (cadr (funcall gnus-extract-address-components
                                    (or (save-excursion
                                          (save-restriction
                                            (message-narrow-to-headers)
--- 110,119 ----
        (while (not result)
          (setq who (read-from-minibuffer
                     (format "%sLookup certificate for: " (or bad ""))
!                    (cadr (funcall (if (boundp
!                                        'gnus-extract-address-components)
!                                       gnus-extract-address-components
!                                     'mail-extract-address-components)
                                    (or (save-excursion
                                          (save-restriction
                                            (message-narrow-to-headers)