[gnus git] branch master updated: m0-3-158-g9679f76 =1= Fix buildbot failure with XEmacs.

       via  9679f7609e3e122e5a59a46a8379644ef2f06dcb (commit)
      from  7cf71c16e7f276f0fd3e5c9d00ac7d218e626f55 (commit)


- Log -----------------------------------------------------------------
commit 9679f7609e3e122e5a59a46a8379644ef2f06dcb
Author: Daiki Ueno <[email protected]>
Date:   Thu Apr 26 17:37:39 2012 +0900

    Fix buildbot failure with XEmacs.
    
    * plstore.el (plstore-called-interactively-p): New compat macro copied
    from message.el.
    (plstore-mode): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ab81fd..e472f33 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2012-04-26  Daiki Ueno  <[email protected]>
 
+	* plstore.el (plstore-called-interactively-p): New compat macro copied
+	from message.el.
+	(plstore-mode): Use it.
+
+2012-04-26  Daiki Ueno  <[email protected]>
+
 	* plstore.el: Revive the editing feature.
 	(plstore-mode): New mode to edit plstore file.
 	(plstore-mode-toggle-display, plstore-mode-original)
diff --git a/lisp/plstore.el b/lisp/plstore.el
index 2f446c8..6d5424e 100644
--- a/lisp/plstore.el
+++ b/lisp/plstore.el
@@ -547,6 +547,18 @@ If no one is selected, symmetric encryption will be performed.  "
       (plstore-mode-original)
     (plstore-mode-decoded)))
 
+(eval-when-compile
+  (defmacro plstore-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)))))
+
 ;;;###autoload
 (define-derived-mode plstore-mode emacs-lisp-mode "PLSTORE"
   "Major mode for editing PLSTORE files."
@@ -554,7 +566,7 @@ If no one is selected, symmetric encryption will be performed.  "
   (add-hook 'write-contents-functions #'plstore--write-contents-functions)
   (define-key plstore-mode-map "\C-c\C-c" #'plstore-mode-toggle-display)
   ;; to create a new file with plstore-mode, mark it as already decoded
-  (if (called-interactively-p 'any)
+  (if (plstore-called-interactively-p 'any)
       (setq plstore-encoded t)
     (plstore-mode-decoded)))
 

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog  |    6 ++++++
 lisp/plstore.el |   14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project