diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2009-10-02 03:48:36 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2009-10-02 03:48:36 +0000 |
| commit | 32226619c5e563c384372b566000e5d37d783a61 (patch) | |
| tree | 216af4221d2ba868b45162679ce3a0462985c422 /lisp/vc.el | |
| parent | 12a3c28c787e23801f40ea557a5c00b538968a52 (diff) | |
Use `called-interactively-p' instead of `interactive-p'.
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index f0275153679..8dfe34a4cb1 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -1577,7 +1577,8 @@ returns t if the buffer had changes, nil otherwise." (error "Not a valid revision range")) ;; Yes, it's painful to call (vc-deduce-fileset) again. Alas, the ;; placement rules for (interactive) don't actually leave us a choice. - (vc-diff-internal t (vc-deduce-fileset) rev1 rev2 (interactive-p))) + (vc-diff-internal t (vc-deduce-fileset) rev1 rev2 + (called-interactively-p 'interactive))) ;; (defun vc-contains-version-controlled-file (dir) ;; "Return t if DIR contains a version-controlled file, nil otherwise." @@ -1598,7 +1599,8 @@ saving the buffer." (if historic (call-interactively 'vc-version-diff) (when buffer-file-name (vc-buffer-sync not-urgent)) - (vc-diff-internal t (vc-deduce-fileset) nil nil (interactive-p)))) + (vc-diff-internal t (vc-deduce-fileset) nil nil + (called-interactively-p 'interactive)))) ;;;###autoload (defun vc-root-diff (historic &optional not-urgent) @@ -1625,7 +1627,8 @@ saving the buffer." (setq rootdir (vc-call-backend backend 'root default-directory)) (setq working-revision (vc-working-revision rootdir)) (vc-diff-internal - t (list backend (list rootdir) working-revision) nil nil (interactive-p))))) + t (list backend (list rootdir) working-revision) nil nil + (called-interactively-p 'interactive))))) ;;;###autoload (defun vc-revision-other-window (rev) |