diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-10 16:56:50 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-10 16:56:50 -0800 |
commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
tree | c8129448cbbf387fe82667ccac02983592c688f1 /lisp/mh-e/mh-mime.el | |
parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz |
Merge from trunk.
Diffstat (limited to 'lisp/mh-e/mh-mime.el')
-rw-r--r-- | lisp/mh-e/mh-mime.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 0327b64a33f..a97185e1496 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -1399,7 +1399,7 @@ See also \\[mh-mh-to-mime]." ("mailto") ; RFC1738 Electronic mail address ("news") ; RFC1738 Usenet news ("nntp") ; RFC1738 Usenet news using NNTP access - ("propspero") ; RFC1738 Prospero Directory Service + ("prospero") ; RFC1738 Prospero Directory Service ("telnet") ; RFC1738 Telnet ("tftp") ; RFC2046 Trivial File Transfer Protocol ("url") ; RFC2017 URL scheme MIME access-type Protocol |