diff lisp/strokes.el @ 105372:bd2966850aac

Use `called-interactively-p' instead of `interactive-p'.

--- a/lisp/strokes.el	Fri Oct 02 00:02:02 2009 +0000
+++ b/lisp/strokes.el	Fri Oct 02 03:48:36 2009 +0000
@@ -1055,7 +1055,7 @@
 	   ;; don't try to update strokes window configuration
 	   ;; if window is dedicated or a minibuffer
 	   nil)
-	  ((or (interactive-p)
+	  ((or (called-interactively-p 'interactive)
 	       (not (buffer-live-p (get-buffer strokes-buffer-name)))
 	       (null strokes-window-configuration))
 	   ;; create `strokes-window-configuration' from scratch...
@@ -1092,7 +1092,7 @@
   (cond ((and (file-exists-p strokes-file)
 	      (file-readable-p strokes-file))
 	 (load-file strokes-file))
-	((interactive-p)
+	((called-interactively-p 'interactive)
 	 (error "Trouble loading user-defined strokes; nothing done"))
 	(t
 	 (message "No user-defined strokes, sorry"))))
@@ -1107,7 +1107,7 @@
 	    (setq strokes-global-map nil)
 	    (strokes-load-user-strokes)
 	    (if (and (not (equal current strokes-global-map))
-		     (or (interactive-p)
+		     (or (called-interactively-p 'interactive)
 			 (yes-or-no-p "Save your strokes? ")))
 		(progn
 		  (require 'pp)		; pretty-print variables
@@ -1202,7 +1202,7 @@
 		  ((strokes-lift-p point)
 		   ;; a lift--tell the loop to X out the next point...
 		   (setq lift-flag t))))
-      (when (interactive-p)
+      (when (called-interactively-p 'interactive)
 	(pop-to-buffer " *strokes-xpm*")
 	;;	(xpm-mode 1)
 	(goto-char (point-min))