VM

Merge lp:~tcross/vm/720677 into lp:vm

  1. 720677
  2. Merge into trunk
Proposed by Tim Cross
Status: Merged
Merged at revision: 1081
Proposed branch: lp:~tcross/vm/720677
Merge into: lp:vm
Diff against target: 20 lines (+9/-1)
1 file modified
lisp/vm-vars.el (+9/-1)
To merge this branch: bzr merge lp:~tcross/vm/720677
Reviewer Review Type Date Requested Status
Uday Reddy Pending
Review via email: mp+50438@code.launchpad.net

Description of the change

Fixes customize definition for vm-mime-external-content-types-alist as outlined in bug 720677.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lisp/vm-vars.el'
2--- lisp/vm-vars.el 2011-02-17 12:06:28 +0000
3+++ lisp/vm-vars.el 2011-02-19 08:41:27 +0000
4@@ -1412,7 +1412,15 @@
5 No multipart message will ever be sent to an external viewer."
6 :group 'vm-mime
7 :type '(choice (const nil)
8- (repeat (list string string))))
9+ (alist :key-type (string :tag "MIME Type")
10+ :value-type (choice
11+ (group :tag "Function"
12+ (function :tag "Function")
13+ (repeat :inline t
14+ (string :tag "Args")))
15+ (group :tag "Program" (file :tag "Program")
16+ (repeat :inline t (string :tag "Args")))
17+ (string :tag "Shell Command")))))
18
19 (defcustom vm-mime-external-content-type-exceptions nil
20 "*List of MIME content types that should not be displayed externally

Subscribers

People subscribed via source and target branches

to all changes: