← Back to branch summary

~vm/vm/vmpc-prompt

« back to all changes in this revision

Viewing changes to lisp/vm-mime.el

  • Committer: Uday S Reddy
  • Date: 2011-06-25 18:11:39 UTC
  • mfrom: (835.1.37 8.2.x)
  • Revision ID: u.s.reddy@cs.bham.ac.uk-20110625181139-oo55o090llr6bkim
Merged 8.2.x branch, revision 873.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lisp/vm-mime.el
5376
5376
    (when (vm-mime-types-match "message/external-body"
5377
5377
                               (car (vm-mm-layout-type layout)))
5378
5378
      (vm-mime-fetch-message/external-body layout)
 
5379
      (if (vm-mm-layout-display-error layout)
 
5380
          (apply 'error (vm-mm-layout-display-error layout)))
5379
5381
      (setq layout (car (vm-mm-layout-parts layout))))
5380
5382
    (if (vm-mime-find-external-viewer (car (vm-mm-layout-type layout)))
5381
5383
        (vm-mime-display-external-generic layout)
5387
5389
    (when (vm-mime-types-match "message/external-body"
5388
5390
                               (car (vm-mm-layout-type layout)))
5389
5391
      (vm-mime-fetch-message/external-body layout)
 
5392
      (if (vm-mm-layout-display-error layout)
 
5393
          (apply 'error (vm-mm-layout-display-error layout)))
5390
5394
      (setq layout (car (vm-mm-layout-parts layout))))
5391
5395
    (setq layout (vm-mime-convert-undisplayable-layout layout))
 
5396
    (if (vm-mm-layout-display-error layout)
 
5397
        (apply 'error (vm-mm-layout-display-error layout)))
5392
5398
    (if (null layout)
5393
5399
        nil
5394
5400
      (vm-set-extent-property button 'vm-mime-disposable t)