* mh-folder.el (mh-inc-folder, mh-modify, mh-scan-folder)

(mh-make-folder): Replace calls to switch-to-buffer with of
pop-to-buffer. The former is intended for interactive use only and
generates warnings in Emacs 24.

2 files changed, 11 insertions, 4 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index ad9d77f2417..0bafedbfd69 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-10  Bill Wohler  <wohler@newt.com>
+
+        * mh-folder.el (mh-inc-folder, mh-modify, mh-scan-folder)
+        (mh-make-folder): Replace calls to switch-to-buffer with of
+        pop-to-buffer. The former is intended for interactive use only and
+        generates warnings in Emacs 24.
+
 2011-07-09  Bill Wohler  <wohler@newt.com>
 
         * mh-speed.el (mh-speed-toggle,mh-speed-view): Document "ignored"
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 40febd641de..2248221664b 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -795,7 +795,7 @@ instead."
              (setq threading-needed-flag mh-show-threads-flag)
              (setq mh-previous-window-config config))
             ((not (eq (current-buffer) (get-buffer folder)))
-             (switch-to-buffer folder)
+             (pop-to-buffer folder)
              (setq mh-previous-window-config config))))
     (mh-get-new-mail file)
     (when (and threading-needed-flag
@@ -855,7 +855,7 @@ From a program, edit MESSAGE; nil means edit current message."
 
     ;; Just show the edit buffer...
     (delete-other-windows)
-    (switch-to-buffer edit-buffer)))
+    (pop-to-buffer edit-buffer)))
 
 ;;;###mh-autoload
 (defun mh-next-button (&optional backward-flag)
@@ -1705,7 +1705,7 @@ DONT-EXEC-PENDING is non-nil."
          (unless dont-exec-pending
            (mh-process-or-undo-commands folder)
            (mh-reset-threads-and-narrowing))
-         (switch-to-buffer folder)))
+         (pop-to-buffer folder)))
   (mh-regenerate-headers range)
   (if (zerop (buffer-size))
       (if (equal range "all")
@@ -1786,7 +1786,7 @@ Also removes all content from the folder buffer."
 (defun mh-make-folder (name)
   "Create a new mail folder called NAME.
 Make it the current folder."
-  (switch-to-buffer name)
+  (pop-to-buffer name)
   (setq buffer-read-only nil)
   (erase-buffer)
   (if mh-adaptive-cmd-note-flag