diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ange-ftp.el | 2 | ||||
| -rw-r--r-- | lisp/net/browse-url.el | 2 | ||||
| -rw-r--r-- | lisp/net/eudc.el | 7 | ||||
| -rw-r--r-- | lisp/net/quickurl.el | 4 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 4 | ||||
| -rw-r--r-- | lisp/net/xesam.el | 2 |
6 files changed, 11 insertions, 10 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 72c6c032bbe..60fe96623e1 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -3797,7 +3797,7 @@ Value is (0 0) if the modification time cannot be determined." keep-date nil nil - (interactive-p))) + (called-interactively-p 'interactive))) (defun ange-ftp-copy-files-async (okay-p line verbose-p files) "Copy some files in the background. diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index a0813a052d8..1e724dda047 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -770,7 +770,7 @@ narrowed." Prompts for a URL, defaulting to the URL at or before point. Variable `browse-url-browser-function' says which browser to use." (interactive (browse-url-interactive-arg "URL: ")) - (unless (interactive-p) + (unless (called-interactively-p 'interactive) (setq args (or args (list browse-url-new-window-flag)))) (let ((process-environment (copy-sequence process-environment))) ;; When connected to various displays, be careful to use the display of diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el index be3654728d8..b93f7e3ddc0 100644 --- a/lisp/net/eudc.el +++ b/lisp/net/eudc.el @@ -706,7 +706,7 @@ server for future sessions." (setq eudc-server server) (eudc-update-local-variables) (run-hooks 'eudc-switch-to-server-hook) - (if (interactive-p) + (if (called-interactively-p 'interactive) (message "Current directory server is now %s (%s)" eudc-server eudc-protocol)) (if (null no-save) (eudc-save-options))) @@ -753,9 +753,10 @@ When called interactively the list is formatted in a dedicated buffer otherwise a list of symbols is returned." (interactive) (if eudc-list-attributes-function - (let ((entries (funcall eudc-list-attributes-function (interactive-p)))) + (let ((entries (funcall eudc-list-attributes-function + (called-interactively-p 'interactive)))) (if entries - (if (interactive-p) + (if (called-interactively-p 'interactive) (eudc-display-records entries t) entries))) (error "The %s protocol has no support for listing attributes" eudc-protocol))) diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el index 96e79cd15ce..8a7e73fa150 100644 --- a/lisp/net/quickurl.el +++ b/lisp/net/quickurl.el @@ -368,7 +368,7 @@ is decided." (quickurl-load-urls) (let* ((current-url (quickurl-find-url word)) (add-it (if current-url - (if (interactive-p) + (if (called-interactively-p 'interactive) (y-or-n-p (format "\"%s\" exists, replace URL? " word)) t) t))) @@ -382,7 +382,7 @@ is decided." (quickurl-save-urls) (when (get-buffer quickurl-list-buffer-name) (quickurl-list-populate-buffer)) - (when (interactive-p) + (when (called-interactively-p 'interactive) (message "Added %s" url)))))) ;;;###autoload diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index ab9a0ba8b7d..dd6f0f0efac 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -2014,7 +2014,7 @@ activity. Only run if the buffer is not visible and "Display list of names in CHANNEL or in current channel if CHANNEL is nil. If called interactively, prompt for a channel when prefix arg is supplied." (interactive "P") - (if (interactive-p) + (if (called-interactively-p 'interactive) (if channel (setq channel (read-string "List names in channel: " target)))) (let ((channel (if (> (length channel) 0) @@ -2026,7 +2026,7 @@ If called interactively, prompt for a channel when prefix arg is supplied." "List TOPIC for the TARGET channel. With a prefix arg, prompt for new topic." (interactive "P") - (if (and (interactive-p) topic) + (if (and (called-interactively-p 'interactive) topic) (setq topic (read-string "New Topic: " rcirc-topic))) (rcirc-send-string process (concat "TOPIC " target (when (> (length topic) 0) diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index b4d61c9c63d..97ecd1d43c0 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el @@ -502,7 +502,7 @@ engine specific, widget :notify function to visualize xesam:url." 'face 'xesam-mode-line 'help-echo (when xesam-debug xesam-xml-string))))))) - (when (not (interactive-p)) + (when (not (called-interactively-p 'interactive)) ;; Initialize buffer. (setq buffer-read-only t) (let ((inhibit-read-only t)) |