[elpa] master fcc77d9 2/2: muse: replace the obsolete interactive-p

[Glenn Morris]

branch: master
commit fcc77d9705e9e1d0a72d45a1255b0eecbdd76d72
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    muse: replace the obsolete interactive-p
    
    * packages/muse/muse-mode.el (muse-insert-tag):
    * packages/muse/muse-project.el (muse-project-find-file)
    (muse-project-publish-this-file):
    * packages/muse/muse-publish.el (muse-publish-region):
    Replace interactive-p, obsolete since 23.2.
---
 packages/muse/muse-mode.el    | 3 +--
 packages/muse/muse-project.el | 4 ++--
 packages/muse/muse-publish.el | 2 +-
 packages/muse/muse.el         | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/muse/muse-mode.el b/packages/muse/muse-mode.el
index 843cf84..75b1db3 100644
--- a/packages/muse/muse-mode.el
+++ b/packages/muse/muse-mode.el
@@ -887,8 +887,7 @@ function, you might want to set this manually.")
      (car muse-tag-history))))
   (when (equal tag "")
     (setq tag (car muse-tag-history)))
-  (unless (interactive-p)
-    (require 'muse-publish))
+  (require 'muse-publish)
   (let ((tag-entry (assoc tag muse-publish-markup-tags))
         (options ""))
     ;; Add to custom list if no entry exists
diff --git a/packages/muse/muse-project.el b/packages/muse/muse-project.el
index d609735..57b0f32 100644
--- a/packages/muse/muse-project.el
+++ b/packages/muse/muse-project.el
@@ -642,7 +642,7 @@ first directory within the project's fileset is used."
      (list entry project)))
   (setq project (muse-project project))
   (let ((project-name (car project)))
-    (unless (interactive-p)
+    (unless (called-interactively-p 'interactive)
       (setq project (muse-project project)
             name (cons name (muse-project-page-file name project))))
     ;; If we're given a relative or absolute filename, open it as-is
@@ -826,7 +826,7 @@ prompting for one."
   (let ((muse-current-project (muse-project-of-file)))
     (if (not muse-current-project)
         ;; file is not part of a project, so fall back to muse-publish
-        (if (interactive-p) (call-interactively 'muse-publish-this-file)
+        (if (called-interactively-p 'interactive) (call-interactively 
'muse-publish-this-file)
           (muse-publish-this-file style nil force))
       (unless style
         (setq style (muse-project-get-applicable-style
diff --git a/packages/muse/muse-publish.el b/packages/muse/muse-publish.el
index a5d5f08..1e79c9f 100644
--- a/packages/muse/muse-publish.el
+++ b/packages/muse/muse-publish.el
@@ -792,7 +792,7 @@ contains a marker.  This is the case with Muse tag 
functions."
   "Apply the given STYLE's markup rules to the given region.
 The result is placed in a new buffer that includes TITLE in its name."
   (interactive "r")
-  (when (interactive-p)
+  (when (called-interactively-p 'interactive)
     (unless title (setq title (read-string "Title: ")))
     (unless style (setq style (muse-publish-get-style))))
   (let ((text (buffer-substring beg end))
diff --git a/packages/muse/muse.el b/packages/muse/muse.el
index a2aa700..ec02427 100644
--- a/packages/muse/muse.el
+++ b/packages/muse/muse.el
@@ -5,7 +5,7 @@
 
 ;; Emacs Lisp Archive Entry
 ;; Filename: muse.el
-;; Version: 3.20.1
+;; Version: 3.20.2
 ;; Date: Sun 31 Jan-2010
 ;; Keywords: hypermedia
 ;; Author: John Wiegley <address@hidden>