[Emacs-diffs] /srv/bzr/emacs/trunk r102516: message.el (message-called-interactively-p): A temporary macro.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102516
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-11-25 23:20:19 +0000
message:
  message.el (message-called-interactively-p): A temporary macro.
  message.el (message-goto-body): Use it temporarily.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-11-25 23:05:10 +0000
+++ b/lisp/gnus/ChangeLog       2010-11-25 23:20:19 +0000
@@ -1,3 +1,8 @@
+2010-11-25  Katsumi Yamaoka  <address@hidden>
+
+       * message.el (message-called-interactively-p): A temporary macro.
+       (message-goto-body): Use it temporarily.
+
 2010-11-25  Lars Magne Ingebrigtsen  <address@hidden>
 
        * nnimap.el (nnimap-unfold-quoted-lines): Refactor out.

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-11-24 22:54:47 +0000
+++ b/lisp/gnus/message.el      2010-11-25 23:20:19 +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))