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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57916aa2f0a32776890f6eee730801c9027b37b0..dbd335b73ddd3af60195cf3a001a33858a11a97c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,12 @@
        * ido.el (ido-read-internal): Use the default history var
        minibuffer-history if no HISTORY is specified.
 
+2011-03-28  Brian T. Sniffen  <bsniffen@akamai.com>  (tiny change)
+
+       * net/imap.el (imap-shell-open, imap-process-connection-type): Use
+       imap-process-connection-type for 'shell' streams as well as
+       Kerberos, SSL, other subprocesses.
+
 2011-03-28  Leo Liu  <sdl.web@gmail.com>
 
        * abbrev.el (abbrev-table-empty-p): New function.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f257ff51f3da5825c53633e194e7c3e8a61c6cee..a6faaf036a57c1db52bfb5330c4d1b74e38210d0 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-29  Julien Danjou  <julien@danjou.info>
+
+       * mm-view.el (mm-display-inline-fontify): Use `set-normal-mode' with
+       local variables disabled rather than `normal-mode'.
+
 2011-03-26  Chong Yidong  <cyd@stupidchicken.com>
 
        * proto-stream.el: Changes preparatory to merging open-protocol-stream

diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 39d49af06004e4e188a85fa869d4ecac0e819604..abd78b8de0277bdbad3a9718eaee029256e74445 100644 (file)
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -603,9 +603,10 @@ If MODE is not set, try to find mode automatically."
            ;; I find font-lock a bit too verbose.
            (font-lock-verbose nil))
         (setq buffer-file-name (mm-handle-filename handle))
+        (set (make-local-variable 'enable-local-variables) nil)
         (if mode
             (funcall mode)
-          (normal-mode))
+          (set-auto-mode))
        ;; The mode function might have already turned on font-lock.
        (unless (symbol-value 'font-lock-mode)
          (font-lock-fontify-buffer)))

diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 6d80b97fd23dccfe4ec5e89badec611d2da485b3..f4af03f100fb44041b3f855eff0436cb6700af49 100644 (file)
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -211,7 +211,7 @@ until a successful connection is made."
   :type '(repeat string))
 
 (defcustom imap-process-connection-type nil
-  "*Value for `process-connection-type' to use for Kerberos4, GSSAPI and SSL.
+  "*Value for `process-connection-type' to use for Kerberos4, GSSAPI, shell, and SSL.
 The `process-connection-type' variable controls the type of device
 used to communicate with subprocesses.  Values are nil to use a
 pipe, or t or `pty' to use a pty.  The value has no effect if the
@@ -770,6 +770,7 @@ sure of changing the value of `foo'."
       (let* ((port (or port imap-default-port))
             (coding-system-for-read imap-coding-system-for-read)
             (coding-system-for-write imap-coding-system-for-write)
+             (process-connection-type imap-process-connection-type)
             (process (start-process
                       name buffer shell-file-name shell-command-switch
                       (format-spec