Mercurial > emacs
comparison lisp/vc-rcs.el @ 83082:108bb5537c12
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-161
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-162
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-163
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-164
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-165
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-166
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-167
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-168
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-169
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-170
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-171
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-172
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-122
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 25 Mar 2004 22:21:45 +0000 |
parents | f0eb34e60705 37e95eddf2e8 |
children | eb7e8d483840 |
comparison
equal
deleted
inserted
replaced
83081:32a426d0a0e3 | 83082:108bb5537c12 |
---|---|
3 ;; Copyright (C) 1992,93,94,95,96,97,98,99,2000,2001 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1992,93,94,95,96,97,98,99,2000,2001 Free Software Foundation, Inc. |
4 | 4 |
5 ;; Author: FSF (see vc.el for full credits) | 5 ;; Author: FSF (see vc.el for full credits) |
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
7 | 7 |
8 ;; $Id: vc-rcs.el,v 1.38 2003/09/01 15:45:17 miles Exp $ | 8 ;; $Id: vc-rcs.el,v 1.39 2004/03/21 15:46:23 spiegel Exp $ |
9 | 9 |
10 ;; This file is part of GNU Emacs. | 10 ;; This file is part of GNU Emacs. |
11 | 11 |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | 12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
13 ;; it under the terms of the GNU General Public License as published by | 13 ;; it under the terms of the GNU General Public License as published by |
477 | 477 |
478 ;;; | 478 ;;; |
479 ;;; History functions | 479 ;;; History functions |
480 ;;; | 480 ;;; |
481 | 481 |
482 (defun vc-rcs-print-log (file) | 482 (defun vc-rcs-print-log (file &optional buffer) |
483 "Get change log associated with FILE." | 483 "Get change log associated with FILE." |
484 (vc-do-command nil 0 "rlog" (vc-name file))) | 484 (vc-do-command buffer 0 "rlog" (vc-name file))) |
485 | 485 |
486 (defun vc-rcs-diff (file &optional oldvers newvers) | 486 (defun vc-rcs-diff (file &optional oldvers newvers buffer) |
487 "Get a difference report using RCS between two versions of FILE." | 487 "Get a difference report using RCS between two versions of FILE." |
488 (if (not oldvers) (setq oldvers (vc-workfile-version file))) | 488 (if (not oldvers) (setq oldvers (vc-workfile-version file))) |
489 (apply 'vc-do-command "*vc-diff*" 1 "rcsdiff" file | 489 (apply 'vc-do-command (or buffer "*vc-diff*") 1 "rcsdiff" file |
490 (append (list "-q" | 490 (append (list "-q" |
491 (concat "-r" oldvers) | 491 (concat "-r" oldvers) |
492 (and newvers (concat "-r" newvers))) | 492 (and newvers (concat "-r" newvers))) |
493 (vc-switches 'RCS 'diff)))) | 493 (vc-switches 'RCS 'diff)))) |
494 | 494 |