[Emacs-diffs] /srv/bzr/emacs/trunk r103773: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103773
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-03-29 13:23:38 +0000
message:
  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.
modified:
  lisp/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/mm-view.el
  lisp/net/imap.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-29 08:25:31 +0000
+++ b/lisp/ChangeLog    2011-03-29 13:23:38 +0000
@@ -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  <address@hidden>  (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  <address@hidden>
 
        * abbrev.el (abbrev-table-empty-p): New function.

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-03-26 23:18:42 +0000
+++ b/lisp/gnus/ChangeLog       2011-03-29 13:23:38 +0000
@@ -1,3 +1,8 @@
+2011-03-29  Julien Danjou  <address@hidden>
+
+       * mm-view.el (mm-display-inline-fontify): Use `set-normal-mode' with
+       local variables disabled rather than `normal-mode'.
+
 2011-03-26  Chong Yidong  <address@hidden>
 
        * proto-stream.el: Changes preparatory to merging open-protocol-stream

=== modified file 'lisp/gnus/mm-view.el'
--- a/lisp/gnus/mm-view.el      2011-03-22 13:40:41 +0000
+++ b/lisp/gnus/mm-view.el      2011-03-29 13:23:38 +0000
@@ -603,9 +603,10 @@
            ;; 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)))

=== modified file 'lisp/net/imap.el'
--- a/lisp/net/imap.el  2011-02-18 07:44:39 +0000
+++ b/lisp/net/imap.el  2011-03-29 13:23:38 +0000
@@ -211,7 +211,7 @@
   :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 @@
       (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