Skip to content

Commit 4b1a43b

Browse files
committed
Replace interactive-p with called-interactively-p
If support for Emacs versions prior to 23.1 is to be dropped (haskell#156) than interactive-p (obsolete as of 23.2) can be removed.
1 parent a3c4144 commit 4b1a43b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

haskell-doc.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1418,7 +1418,7 @@ See variable docstring."
14181418

14191419
(run-hooks 'haskell-doc-mode-hook))
14201420

1421-
(and (interactive-p)
1421+
(and (called-interactively-p 'any)
14221422
(message "haskell-doc-mode is %s"
14231423
(if haskell-doc-mode "enabled" "disabled")))
14241424
haskell-doc-mode)

inf-haskell.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ The returned info is cached for reuse by `haskell-doc-mode'."
537537
(delq (assoc sym haskell-doc-user-defined-ids)
538538
haskell-doc-user-defined-ids)))))
539539

540-
(if (interactive-p) (message "%s" type))
540+
(if (called-interactively-p 'any) (message "%s" type))
541541
(when insert-value
542542
(beginning-of-line)
543543
(insert type "\n"))
@@ -553,7 +553,7 @@ The returned info is cached for reuse by `haskell-doc-mode'."
553553
"Show kind of: ")
554554
nil nil type))))
555555
(let ((result (inferior-haskell-get-result (concat ":kind " type))))
556-
(if (interactive-p) (message "%s" result))
556+
(if (called-interactively-p 'any) (message "%s" result))
557557
result))
558558

559559
;;;###autoload
@@ -566,7 +566,7 @@ The returned info is cached for reuse by `haskell-doc-mode'."
566566
"Show info of: ")
567567
nil nil sym))))
568568
(let ((result (inferior-haskell-get-result (concat ":info " sym))))
569-
(if (interactive-p) (message "%s" result))
569+
(if (called-interactively-p 'any) (message "%s" result))
570570
result))
571571

572572
;;;###autoload

0 commit comments

Comments
 (0)