# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1174407827 0
# Node ID 98c3595cace46edd770ca35ed1d22a07f1ceaeef
# Parent  32db7e65b617f7f245a62f4b6e5040d84b6347bd
(compose-mail): Run switch-function after setting up the mail buffer.

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

diff -r 32db7e65b617 -r 98c3595cace4 lisp/simple.el
--- a/lisp/simple.el	Tue Mar 20 16:23:09 2007 +0000
+++ b/lisp/simple.el	Tue Mar 20 16:23:47 2007 +0000
@@ -4726,9 +4726,16 @@
 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 @@
     (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.