Mercurial > emacs
comparison lisp/ediff.el @ 105372:bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Fri, 02 Oct 2009 03:48:36 +0000 |
| parents | affb617d6101 |
| children | 009383a57ce8 |
comparison
equal
deleted
inserted
replaced
| 105371:0769a73f1d18 | 105372:bd2966850aac |
|---|---|
| 1451 ;;;###autoload | 1451 ;;;###autoload |
| 1452 (defun ediff-version () | 1452 (defun ediff-version () |
| 1453 "Return string describing the version of Ediff. | 1453 "Return string describing the version of Ediff. |
| 1454 When called interactively, displays the version." | 1454 When called interactively, displays the version." |
| 1455 (interactive) | 1455 (interactive) |
| 1456 (if (interactive-p) | 1456 (if (called-interactively-p 'interactive) |
| 1457 (message "%s" (ediff-version)) | 1457 (message "%s" (ediff-version)) |
| 1458 (format "Ediff %s of %s" ediff-version ediff-date))) | 1458 (format "Ediff %s of %s" ediff-version ediff-date))) |
| 1459 | 1459 |
| 1460 ;; info is run first, and will autoload info.el. | 1460 ;; info is run first, and will autoload info.el. |
| 1461 (declare-function Info-goto-node "info" (nodename &optional fork)) | 1461 (declare-function Info-goto-node "info" (nodename &optional fork)) |