~ubuntu-branches/ubuntu/trusty/semi/trusty

« back to all changes in this revision

Viewing changes to mime-pgp.el

  • Committer: Bazaar Package Importer
  • Author(s): Tatsuya Kinoshita
  • Date: 2010-02-08 23:40:04 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100208234004-zra1zdm4bgijt51o
Tags: 1.14.6+0.20100207-1
* New upstream release. (CVS semi-1_14 branch on 2010-02-07)
  - Fix non-compliant messages that are signed and encrypted with OpenPGP.
    (closes: #555472)
  - Fix missing mandatory "Version: 1" field for application/pgp-encrypted.
    (closes: #554720)
* debian/rules: Add direntry to *.texi for *.info. (closes: #528895)
* debian/prerm, debian/postinst: Removed.
* debian/control:
  - Add `dpkg (>= 1.15.4) | install-info' to Depends.
  - Add `${misc:Depends}' to Depends.
  - Set Section to lisp.
  - Update Standards-Version to 3.8.4.
* debian/copyright: Updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
270
270
        (setq mime-view-temp-message-buffer message-buf))
271
271
      (set-window-buffer p-win preview-buffer))))
272
272
 
 
273
(defun mime-display-multipart/pgp-encrypted (entity situation)
 
274
   (if pgg-decrypt-automatically
 
275
       (let ((pgp-begin (point)))
 
276
         (mime-insert-entity entity)
 
277
         (goto-char pgp-begin)
 
278
         (when (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t)
 
279
           (pgg-decrypt-region pgp-begin (point-max))
 
280
           (delete-region pgp-begin (point-max))
 
281
           (mime-display-entity
 
282
            (mime-parse-buffer pgg-output-buffer))))
 
283
     (mime-display-multipart/mixed entity situation)))
273
284
 
274
285
;;; @ end
275
286
;;;