# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1290727219 0
# Node ID f6563e4356cb283f41cd4a61af9cfa840b85f7e5
# Parent  d00ba7ce3ef08bc8854cdb6bffb4ad1e391776be
message.el (message-called-interactively-p): A temporary macro.
message.el (message-goto-body): Use it temporarily.

diff -r d00ba7ce3ef0 -r f6563e4356cb lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Thu Nov 25 23:05:10 2010 +0000
+++ b/lisp/gnus/ChangeLog	Thu Nov 25 23:20:19 2010 +0000
@@ -1,3 +1,8 @@
+2010-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* message.el (message-called-interactively-p): A temporary macro.
+	(message-goto-body): Use it temporarily.
+
 2010-11-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* nnimap.el (nnimap-unfold-quoted-lines): Refactor out.
diff -r d00ba7ce3ef0 -r f6563e4356cb lisp/gnus/message.el
--- a/lisp/gnus/message.el	Thu Nov 25 23:05:10 2010 +0000
+++ b/lisp/gnus/message.el	Thu Nov 25 23:20:19 2010 +0000
@@ -3047,10 +3047,22 @@
   (interactive)
   (message-position-on-field "Summary" "Subject"))
 
+(eval-when-compile
+  (defmacro message-called-interactively-p (kind)
+    (condition-case nil
+	(progn
+	  (eval '(called-interactively-p 'any))
+	  ;; Emacs >=23.2
+	  `(called-interactively-p ,kind))
+      ;; Emacs <23.2
+      (wrong-number-of-arguments '(called-interactively-p))
+      ;; XEmacs
+      (void-function '(interactive-p)))))
+
 (defun message-goto-body ()
   "Move point to the beginning of the message body."
   (interactive)
-  (when (and (called-interactively-p 'any)
+  (when (and (message-called-interactively-p 'any)
 	     (looking-at "[ \t]*\n"))
     (expand-abbrev))
   (goto-char (point-min))