Merge changes made in Gnus trunk.
commitb62f8267c3356c0f8d5357d148726a82bf37b371
authorGnus developers <ding@gnus.org>
Tue, 29 Mar 2011 13:23:38 +0000 (29 13:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 29 Mar 2011 13:23:38 +0000 (29 13:23 +0000)
tree5d937630d9619a8dd364bdca20bc073bc4a237b7
parentea62283460e5aae0f3e5dc68f38d035d5f17f540
Merge changes made in Gnus trunk.

mm-view.el (mm-display-inline-fontify): Use `set-normal-mode' with local variables disabled rather than `normal-mode'.
imap.el (imap-shell-open, imap-process-connection-type): Use imap-process-connection-type for 'shell' streams as well as Kerberos, SSL, other subprocesses.
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/gnus/mm-view.el
lisp/net/imap.el