(compose-mail): Run switch-function after setting up the mail buffer.

(switch-to-completions): No error if search for \n\n fails.

2 files changed, 27 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31621363d53..705642dc7f3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-20  Richard Stallman  <rms@gnu.org>
+
+        * textmodes/ispell.el (ispell-call-process): New function.
+        Defends against bad `default-directory.'
+        (ispell-check-version, ispell-find-aspell-dictionaries)
+        (ispell-get-aspell-config-value, lookup-words): Call it.
+        (ispell-call-process-region): New function.
+        (ispell-send-string): Call it.
+
 2007-03-20  Andreas Schwab  <schwab@suse.de>
 
         * Makefile.in (custom-deps): Depend on $(lisp)/subdirs.el.
@@ -52,6 +61,9 @@
         * files.el (default-directory): Mark safe.
         (basic-save-buffer-2): Put proper dir name in error message.
 
+        * simple.el (compose-mail): Run switch-function after
+        setting up the mail buffer.
+
         * startup.el (inhibit-splash-screen, initial-major-mode): Doc fixes.
 
 2007-03-18  Jay Belanger  <belanger@truman.edu>
@@ -94,6 +106,10 @@
         * autorevert.el (auto-revert-tail-handler):
         Call after-revert-hook.
 
+2007-03-17  Ryan Yeske  <rcyeske@gmail.com>
+
+        * simple.el (switch-to-completions): No error if search for \n\n fails.
+
 2007-03-17  Chong Yidong  <cyd@stupidchicken.com>
 
         * simple.el (line-move-1): Respect
diff --git a/lisp/simple.el b/lisp/simple.el
index 5bbfa317958..6871993d2b7 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4726,9 +4726,16 @@ SEND-ACTIONS is a list of actions to call when the message is sent.
 Each action has the form (FUNCTION . ARGS)."
   (interactive
    (list nil nil nil current-prefix-arg))
-  (let ((function (get mail-user-agent 'composefunc)))
-    (funcall function to subject other-headers continue
-             switch-function yank-action send-actions)))
+  (let ((function (get mail-user-agent 'composefunc))
+        result-buffer)
+    (if switch-function
+        (save-window-excursion
+          (prog1
+              (funcall function to subject other-headers continue
+                       nil yank-action send-actions)
+            (funcall switch-function (current-buffer))))
+      (funcall function to subject other-headers continue
+               nil yank-action send-actions))))
 
 (defun compose-mail-other-window (&optional to subject other-headers continue
                                             yank-action send-actions)
@@ -5165,7 +5172,7 @@ select the completion near point.\n\n"))))))
     (when window
       (select-window window)
       (goto-char (point-min))
-      (search-forward "\n\n")
+      (search-forward "\n\n" nil t)
       (forward-line 1))))
 
 ;;; Support keyboard commands to turn on various modifiers.