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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/03/28 18:36:02

Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.852
retrieving revision 1.853
diff -u -b -r1.852 -r1.853
--- simple.el   20 Mar 2007 16:23:47 -0000      1.852
+++ simple.el   28 Mar 2007 18:36:01 -0000      1.853
@@ -130,8 +130,10 @@
 
 (defcustom next-error-highlight 0.5
   "*Highlighting of locations in selected source buffers.
-If number, highlight the locus in `next-error' face for given time in seconds.
-If t, highlight the locus indefinitely until some other locus replaces it.
+If a number, highlight the locus in `next-error' face for the given time
+in seconds, or until the next command is executed.
+If t, highlight the locus until the next command is executed, or until
+some other locus replaces it.
 If nil, don't highlight the locus in the source buffer.
 If `fringe-arrow', indicate the locus by the fringe arrow."
   :type '(choice (number :tag "Highlight for specified time")
@@ -4726,16 +4728,9 @@
 Each action has the form (FUNCTION . ARGS)."
   (interactive
    (list nil nil nil current-prefix-arg))
-  (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))))
+  (let ((function (get mail-user-agent 'composefunc)))
       (funcall function to subject other-headers continue
-              nil yank-action send-actions))))
+            switch-function yank-action send-actions)))
 
 (defun compose-mail-other-window (&optional to subject other-headers continue
                                            yank-action send-actions)