Mercurial > hg > xemacs-beta

comparison lisp/packages/vc.el @ 177:6075d714658b r20-3b15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b15
author cvs
date Mon, 13 Aug 2007 09:51:16 +0200
parents 929b76928fce
children b405438285a2
comparison
equal deleted inserted replaced
176:6866abce6aaf 177:6075d714658b
2 2
3 ;; Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. 3 ;; Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
4 4
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> 5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> 6 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
7 ;; Maintainer: (ClearCase) Rod Whitby <rwhitby@geocities.com>
7 ;; XEmacs conversion: Steve Baur <steve@altair.xemacs.org> 8 ;; XEmacs conversion: Steve Baur <steve@altair.xemacs.org>
8 9
9 ;; This file is part of GNU Emacs. 10 ;; This file is part of GNU Emacs.
10 11
11 ;; 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
64 ;; vc's back is turned, or move/rename master files while vc is running, 65 ;; vc's back is turned, or move/rename master files while vc is running,
65 ;; vc may get seriously confused. Don't do these things! 66 ;; vc may get seriously confused. Don't do these things!
66 ;; 67 ;;
67 ;; Developer's notes on some concurrency issues are included at the end of 68 ;; Developer's notes on some concurrency issues are included at the end of
68 ;; the file. 69 ;; the file.
69 70 ;;
71 ;; Rudimentary ClearCase support by Rod Whitby <rwhitby@geocities.com>.
72 ;; I (Rod Whitby) intend to maintain the rudimentary functionality that is
73 ;; currently in this file. At some time in the future (don't hold your
74 ;; breath), I intend to merge the functionality of the cc-vc package
75 ;; (separately available from /rtfm.mit.edu:/pub/cc-vc/) into this file.
76 ;; I am not the maintainer of cc-vc, nor am I the maintainer of the
77 ;; non-ClearCase parts of this file.
70 ;;; Code: 78 ;;; Code:
71 79
72 (require 'vc-hooks) 80 (require 'vc-hooks)
73 (require 'ring) 81 (require 'ring)
74 (eval-when-compile (require 'dired)) ; for dired-map-over-marks macro 82 (eval-when-compile (require 'dired)) ; for dired-map-over-marks macro
1162 (pop-to-buffer "*vc-diff*") 1170 (pop-to-buffer "*vc-diff*")
1163 (goto-char (point-min)) 1171 (goto-char (point-min))
1164 (shrink-window-if-larger-than-buffer))) 1172 (shrink-window-if-larger-than-buffer)))
1165 (not unchanged)))) 1173 (not unchanged))))
1166 1174
1175 ;;;###autoload
1167 (defun vc-version-diff (file rel1 rel2) 1176 (defun vc-version-diff (file rel1 rel2)
1168 "For FILE, report diffs between two stored versions REL1 and REL2 of it. 1177 "For FILE, report diffs between two stored versions REL1 and REL2 of it.
1169 If FILE is a directory, generate diffs between versions for all registered 1178 If FILE is a directory, generate diffs between versions for all registered
1170 files in or below it." 1179 files in or below it."
1171 (interactive "FFile or directory to diff: \nsOlder version: \nsNewer version: ") 1180 (interactive "FFile or directory to diff: \nsOlder version: \nsNewer version: ")