Revert last patch since that made it break even more

[gnus] / lisp / gmm-utils.el

diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el
index 2e19615..459a786 100644 (file)
--- a/lisp/gmm-utils.el
+++ b/lisp/gmm-utils.el
@@ -1,6 +1,6 @@
 ;;; gmm-utils.el --- Utility functions for Gnus, Message and MML
 
-;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2014 Free Software Foundation, Inc.
 
 ;; Author: Reiner Steib <reiner.steib@gmx.de>
 ;; Keywords: news
@@ -99,7 +99,7 @@ ARGS are passed to `message'."
 
 ;; Copy of the `nnmail-lazy' code from `nnmail.el':
 (define-widget 'gmm-lazy 'default
-  "Base widget for recursive datastructures.
+  "Base widget for recursive data structures.
 
 This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
   :format "%{%t%}: %v"
@@ -418,16 +418,16 @@ coding-system."
     (write-region start end filename append visit lockname mustbenew)))
 
 ;; `interactive-p' is obsolete since Emacs 23.2.
-(defalias 'gmm-called-interactively-p
+(defmacro gmm-called-interactively-p (kind)
   (condition-case nil
       (progn
        (eval '(called-interactively-p 'any))
        ;; Emacs >=23.2
-       'called-interactively-p)
+       `(called-interactively-p ,kind))
     ;; Emacs <23.2
-    (wrong-number-of-arguments '(lambda (kind) (called-interactively-p)))
+    (wrong-number-of-arguments '(called-interactively-p))
     ;; XEmacs
-    (void-function '(lambda (kind) (interactive-p)))))
+    (void-function '(interactive-p))))
 
 ;; `flet' and `labels' are obsolete since Emacs 24.3.
 (defmacro gmm-flet (bindings &rest body)