diff options
| author | Gnus developers <ding@gnus.org> | 2011-01-25 23:51:40 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-01-25 23:51:40 +0000 |
| commit | 008cad902f3434dc8c490dd0488ae93df4f16d9c (patch) | |
| tree | ec9c6c6a60efbb66ceef6b2f21a4e174d2185807 /lisp/gnus/mm-view.el | |
| parent | 7e6e2304f863f898e812b53f03b83f16e7f798c4 (diff) | |
| download | emacs-008cad902f3434dc8c490dd0488ae93df4f16d9c.tar.gz | |
Merge changes made in Gnus trunk.
mm-view.el (mm-display-shell-script-inline): Fix typo in docstring.
(mm-display-javascript-inline): New function.
mm-decode.el (mm-inline-media-tests): Add application/javascript viewing function.
nnimap.el (nnimap-open-connection-1): Store the actual stream type used.
(nnimap-login): Prefer plain LOGIN if it's enabled (since it requires fewer round trips than CRAM-MD5, and it's less likely to be buggy), and we're using an encrypted connection.
proto-stream.el: Alter the interface functions to also return the actual stream type used: network or tls.
Diffstat (limited to 'lisp/gnus/mm-view.el')
| -rw-r--r-- | lisp/gnus/mm-view.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index e3286b854e4..d63d20239dc 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -636,9 +636,13 @@ (mm-display-inline-fontify handle 'org-mode)) (defun mm-display-shell-script-inline (handle) - "Show an shell script from HANDLE inline." + "Show a shell script from HANDLE inline." (mm-display-inline-fontify handle 'shell-script-mode)) +(defun mm-display-javascript-inline (handle) + "Show JavsScript code from HANDLE inline." + (mm-display-inline-fontify handle 'javascript-mode)) + ;; id-signedData OBJECT IDENTIFIER ::= { iso(1) member-body(2) ;; us(840) rsadsi(113549) pkcs(1) pkcs7(7) 2 } (defvar mm-pkcs7-signed-magic |