Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantipov@yandex.ru

[gnu-emacs] / lisp / gnus / mm-view.el

diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index ecfa2ac958252318cb735ae5fbc4827a0f59be21..bf24f3496220c263abfee9b681caeaaae096dd02 100644 (file)
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -513,7 +513,9 @@ If MODE is not set, try to find mode automatically."
         (set (make-local-variable 'enable-local-variables) nil)
        (with-demoted-errors
          (if mode
-             (funcall mode)
+             (save-window-excursion
+               (switch-to-buffer (current-buffer))
+               (funcall mode))
            (let ((auto-mode-alist
                   (delq (rassq 'doc-view-mode-maybe auto-mode-alist)
                         (copy-sequence auto-mode-alist))))