procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes made in Gnus trunk.

Browse source 
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.
This commit is contained in:
Gnus developers 2011-01-25 23:51:40 +00:00 • committed by Katsumi Yamaoka
parent 7e6e2304f8
commit 008cad902f
5 changed files with 51 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/gnus/mm-view.el
View file

@ -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