X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/8bfde4bea15ac3e1f881f33b5842ab21705bd21c..26238072db2d78af84b46cd84a4b0a8260e4a9dd:/lisp/vc-sccs.el diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el index a333a4d668..e4d14d8ae7 100644 --- a/lisp/vc-sccs.el +++ b/lisp/vc-sccs.el @@ -1,11 +1,12 @@ ;;; vc-sccs.el --- support for SCCS version-control -;; Copyright (C) 1992,93,94,95,96,97,98,99,2000,2001 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +;; 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel -;; $Id: vc-sccs.el,v 1.22 2003/05/08 19:18:33 monnier Exp $ +;; $Id$ ;; This file is part of GNU Emacs. @@ -21,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -150,7 +151,7 @@ For a description of possible values, see `vc-check-master-templates'." 'locking) (defun vc-sccs-workfile-unchanged-p (file) - "SCCS-specific implementation of vc-workfile-unchanged-p." + "SCCS-specific implementation of `vc-workfile-unchanged-p'." (zerop (apply 'vc-do-command nil 1 "vcdiff" (vc-name file) (list "--brief" "-q" (concat "-r" (vc-workfile-version file)))))) @@ -270,9 +271,9 @@ EDITABLE non-nil means previous version should be locked." ;;; History functions ;;; -(defun vc-sccs-print-log (file) +(defun vc-sccs-print-log (file &optional buffer) "Get change log associated with FILE." - (vc-do-command nil 0 "prs" (vc-name file))) + (vc-do-command buffer 0 "prs" (vc-name file))) (defun vc-sccs-logentry-check () "Check that the log entry in the current buffer is acceptable for SCCS." @@ -280,11 +281,11 @@ EDITABLE non-nil means previous version should be locked." (goto-char 512) (error "Log must be less than 512 characters; point is now at pos 512"))) -(defun vc-sccs-diff (file &optional oldvers newvers) +(defun vc-sccs-diff (file &optional oldvers newvers buffer) "Get a difference report using SCCS between two versions of FILE." (setq oldvers (vc-sccs-lookup-triple file oldvers)) (setq newvers (vc-sccs-lookup-triple file newvers)) - (apply 'vc-do-command "*vc-diff*" 1 "vcdiff" (vc-name file) + (apply 'vc-do-command (or buffer "*vc-diff*") 1 "vcdiff" (vc-name file) (append (list "-q" (and oldvers (concat "-r" oldvers)) (and newvers (concat "-r" newvers))) @@ -397,4 +398,5 @@ If NAME is nil or a version number string it's just passed through." (provide 'vc-sccs) +;; arch-tag: d751dee3-d7b3-47e1-95e3-7ae98c052041 ;;; vc-sccs.el ends here