message-goto-body: Really return point

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67a0835..2292084 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * message.el (message-goto-body): Use called-interactively-p.
        (message-in-body-p): message-goto-body returns point.
+       (message-goto-body): Really return point.
 
 2010-11-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

diff --git a/lisp/message.el b/lisp/message.el
index 25b5ae4..f87030e 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3092,14 +3092,17 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
   (message-position-on-field "Summary" "Subject"))
 
 (defun message-goto-body ()
-  "Move point to the beginning of the message body."
+  "Move point to the beginning of the message body.
+Return point."
   (interactive)
   (when (and (called-interactively-p)
             (looking-at "[ \t]*\n"))
     (expand-abbrev))
   (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)))
+      (search-forward-regexp "[^:]+:\\([^\n]\\|\n[ \t]\\)+\n\n" nil t))
+  (while (looking-at "^<#secure") (forward-line 1))
+  (point))
 
 (defun message-in-body-p ()
   "Return t if point is in the message body."