Mercurial > emacs
changeset 54465:2e4ddb8bfffd
(vc-cvs-print-log, vc-cvs-diff): Add optional BUFFER argument.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Sun, 21 Mar 2004 15:45:31 +0000 |
| parents | d74cf16e31cd |
| children | 37e95eddf2e8 |
| files | lisp/vc-cvs.el |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-cvs.el Sun Mar 21 15:44:39 2004 +0000 +++ b/lisp/vc-cvs.el Sun Mar 21 15:45:31 2004 +0000 @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> -;; $Id: vc-cvs.el,v 1.66 2003/10/01 13:22:53 fx Exp $ +;; $Id: vc-cvs.el,v 1.67 2004/01/20 17:41:18 uid65624 Exp $ ;; This file is part of GNU Emacs. @@ -533,14 +533,14 @@ ;;; History functions ;;; -(defun vc-cvs-print-log (file) +(defun vc-cvs-print-log (file &optional buffer) "Get change log associated with FILE." (vc-cvs-command - nil + buffer (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0) file "log")) -(defun vc-cvs-diff (file &optional oldvers newvers) +(defun vc-cvs-diff (file &optional oldvers newvers buffer) "Get a difference report using CVS between two versions of FILE." (if (string= (vc-workfile-version file) "0") ;; This file is added but not yet committed; there is no master file. @@ -549,13 +549,13 @@ ;; We regard this as "changed". ;; Diff it against /dev/null. ;; Note: this is NOT a "cvs diff". - (apply 'vc-do-command "*vc-diff*" + (apply 'vc-do-command (or buffer "*vc-diff*") 1 "diff" file (append (vc-switches nil 'diff) '("/dev/null"))) ;; Even if it's empty, it's locally modified. 1) (let* ((async (and (vc-stay-local-p file) (fboundp 'start-process))) - (status (apply 'vc-cvs-command "*vc-diff*" + (status (apply 'vc-cvs-command (or buffer "*vc-diff*") (if async 'async 1) file "diff" (and oldvers (concat "-r" oldvers))