HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 2011 to FSF/AIST copyright years.
[bpt/emacs.git]
/
lisp
/
vc-sccs.el
diff --git
a/lisp/vc-sccs.el
b/lisp/vc-sccs.el
index
9236f60
..
4e89e72
100644
(file)
--- a/
lisp/vc-sccs.el
+++ b/
lisp/vc-sccs.el
@@
-1,7
+1,7
@@
;;; vc-sccs.el --- support for SCCS version-control
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
;;; vc-sccs.el --- support for SCCS version-control
;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
, 2010, 2011
;; Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
;; Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
@@
-24,6
+24,10
@@
;;; Commentary:
;;; Commentary:
+;; Proper function of the SCCS diff commands requires the shellscript vcdiff
+;; to be installed somewhere on Emacs's path for executables.
+;;
+
;;; Code:
(eval-when-compile
;;; Code:
(eval-when-compile
@@
-73,7
+77,7
@@
If nil, use the value of `vc-diff-switches'. If t, use no switches."
;;;###autoload
(defcustom vc-sccs-master-templates
;;;###autoload
(defcustom vc-sccs-master-templates
-
'("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir
)
+
(purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)
)
"Where to look for SCCS master files.
For a description of possible values, see `vc-check-master-templates'."
:type '(choice (const :tag "Use standard SCCS file names"
"Where to look for SCCS master files.
For a description of possible values, see `vc-check-master-templates'."
:type '(choice (const :tag "Use standard SCCS file names"
@@
-288,7
+292,7
@@
locked. REV is the revision to check out."
are expanded to all version-controlled subfiles."
(setq files (vc-expand-dirs files))
(if (not files)
are expanded to all version-controlled subfiles."
(setq files (vc-expand-dirs files))
(if (not files)
- (error "SCCS backend doesn't support directory-level rollback
.
"))
+ (error "SCCS backend doesn't support directory-level rollback"))
(dolist (file files)
(let ((discard (vc-working-revision file)))
(if (null (yes-or-no-p (format "Remove version %s from %s history? "
(dolist (file files)
(let ((discard (vc-working-revision file)))
(if (null (yes-or-no-p (format "Remove version %s from %s history? "
@@
-331,10
+335,11
@@
revert all subfiles."
;;; History functions
;;;
;;; History functions
;;;
-(defun vc-sccs-print-log (files
&optional buffer
)
+(defun vc-sccs-print-log (files
buffer &optional shortlog start-revision-ignored limit
)
"Get change log associated with FILES."
(setq files (vc-expand-dirs files))
"Get change log associated with FILES."
(setq files (vc-expand-dirs files))
- (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files)))
+ (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files))
+ (when limit 'limit-unsupported))
(defun vc-sccs-diff (files &optional oldvers newvers buffer)
"Get a difference report using SCCS between two filesets."
(defun vc-sccs-diff (files &optional oldvers newvers buffer)
"Get a difference report using SCCS between two filesets."
@@
-370,6
+375,12
@@
revert all subfiles."
;;; Miscellaneous
;;;
;;; Miscellaneous
;;;
+(defun vc-sccs-previous-revision (file rev)
+ (vc-call-backend 'RCS 'previous-revision file rev))
+
+(defun vc-sccs-next-revision (file rev)
+ (vc-call-backend 'RCS 'next-revision file rev))
+
(defun vc-sccs-check-headers ()
"Check if the current file has any headers in it."
(save-excursion
(defun vc-sccs-check-headers ()
"Check if the current file has any headers in it."
(save-excursion