[Emacs-diffs] Changes to emacs/lisp/simple.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       07/03/20 16:23:47

Index: simple.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/simple.el,v
retrieving revision 1.851
retrieving revision 1.852
diff -u -b -r1.851 -r1.852
--- simple.el   19 Mar 2007 18:28:31 -0000      1.851
+++ simple.el   20 Mar 2007 16:23:47 -0000      1.852
@@ -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)))
+  (let ((function (get mail-user-agent 'composefunc))
+       result-buffer)
+    (if switch-function
+       (save-window-excursion
+         (prog1
     (funcall function to subject other-headers continue
-            switch-function yank-action send-actions)))
+                      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.