message-in-body-p should not alter anything.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 924e8ea95d860e483cc8eba1e1011122ac9ff87c..45f23a6d99c84710410b82505169c01028ab0ee5 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
 2012-09-17  Richard Stallman  <rms@gnu.org>
 
+       * message.el (message-in-body-p): Don't set mark or modify buffer.
+
        * mml.el (mml-attach-file): Doc fix.
        (mml-attach-external, mml-attach-buffer, mml-attach-file):
        Set mail-encode-mml when in Mail mode.

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 42911ce06488fd2b86cf1baf6ec99e9e3b0f1682..5360f008432441c2184d346f60416e6cb7621e42 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3160,8 +3160,12 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
 
 (defun message-in-body-p ()
   "Return t if point is in the message body."
-  (let ((body (save-excursion (message-goto-body))))
-    (>= (point) body)))
+  (>= (point)
+      (save-excursion
+       (goto-char (point-min))
+       (or (search-forward (concat "\n" mail-header-separator "\n") nil t)
+           (search-forward-regexp "[^:]+:\\([^\n]\\|\n[ \t]\\)+\n\n" nil t))
+       (point))))
 
 (defun message-goto-eoh ()
   "Move point to the end of the headers."