aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1997-12-04 05:56:22 +0000
committerKarl Heuer1997-12-04 05:56:22 +0000
commit50bec09179d68f86bbef0e637bd8c1dabf8ebe23 (patch)
tree2089c035d9fd4c4cc31372807f7cc16c4ac6a171
parent03effc232ed9b79aba077d912f17dd844d703e5e (diff)
downloademacs-50bec09179d68f86bbef0e637bd8c1dabf8ebe23.tar.gz
emacs-50bec09179d68f86bbef0e637bd8c1dabf8ebe23.zip
Customized.
-rw-r--r--lisp/vc-hooks.el68
1 files changed, 46 insertions, 22 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index ce002a68ed8..0898c2dbd10 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -33,39 +33,52 @@
33 33
34;; Customization Variables (the rest is in vc.el) 34;; Customization Variables (the rest is in vc.el)
35 35
36(defvar vc-default-back-end nil 36(defcustom vc-default-back-end nil
37 "*Back-end actually used by this interface; may be SCCS or RCS. 37 "*Back-end actually used by this interface; may be SCCS or RCS.
38The value is only computed when needed to avoid an expensive search.") 38The value is only computed when needed to avoid an expensive search."
39 :type '(choice (const nil) (const RCS) (const SCCS))
40 :group 'vc)
39 41
40(defvar vc-handle-cvs t 42(defcustom vc-handle-cvs t
41 "*If non-nil, use VC for files managed with CVS. 43 "*If non-nil, use VC for files managed with CVS.
42If it is nil, don't use VC for those files.") 44If it is nil, don't use VC for those files."
45 :type 'boolean
46 :group 'vc)
43 47
44(defvar vc-rcsdiff-knows-brief nil 48(defcustom vc-rcsdiff-knows-brief nil
45 "*Indicates whether rcsdiff understands the --brief option. 49 "*Indicates whether rcsdiff understands the --brief option.
46The value is either `yes', `no', or nil. If it is nil, VC tries 50The value is either `yes', `no', or nil. If it is nil, VC tries
47to use --brief and sets this variable to remember whether it worked.") 51to use --brief and sets this variable to remember whether it worked."
52 :type '(choice (const nil) (const yes) (const no))
53 :group 'vc)
48 54
49(defvar vc-path 55(defcustom vc-path
50 (if (file-directory-p "/usr/sccs") 56 (if (file-directory-p "/usr/sccs")
51 '("/usr/sccs") 57 '("/usr/sccs")
52 nil) 58 nil)
53 "*List of extra directories to search for version control commands.") 59 "*List of extra directories to search for version control commands."
60 :type '(repeat directory)
61 :group 'vc)
54 62
55(defvar vc-master-templates 63
64(defcustom vc-master-templates
56 '(("%sRCS/%s,v" . RCS) ("%s%s,v" . RCS) ("%sRCS/%s" . RCS) 65 '(("%sRCS/%s,v" . RCS) ("%s%s,v" . RCS) ("%sRCS/%s" . RCS)
57 ("%sSCCS/s.%s" . SCCS) ("%ss.%s". SCCS) 66 ("%sSCCS/s.%s" . SCCS) ("%ss.%s". SCCS)
58 vc-find-cvs-master) 67 vc-find-cvs-master)
59 "*Where to look for version-control master files. 68 "*Where to look for version-control master files.
60The first pair corresponding to a given back end is used as a template 69The first pair corresponding to a given back end is used as a template
61when creating new masters. 70when creating new masters.
62Setting this variable to nil turns off use of VC entirely.") 71Setting this variable to nil turns off use of VC entirely."
72 :type '(repeat sexp)
73 :group 'vc)
63 74
64(defvar vc-make-backup-files nil 75(defcustom vc-make-backup-files nil
65 "*If non-nil, backups of registered files are made as with other files. 76 "*If non-nil, backups of registered files are made as with other files.
66If nil (the default), files covered by version control don't get backups.") 77If nil (the default), files covered by version control don't get backups."
78 :type 'boolean
79 :group 'vc)
67 80
68(defvar vc-follow-symlinks 'ask 81(defcustom vc-follow-symlinks 'ask
69 "*Indicates what to do if you visit a symbolic link to a file 82 "*Indicates what to do if you visit a symbolic link to a file
70that is under version control. Editing such a file through the 83that is under version control. Editing such a file through the
71link bypasses the version control system, which is dangerous and 84link bypasses the version control system, which is dangerous and
@@ -73,24 +86,35 @@ probably not what you want.
73 If this variable is t, VC follows the link and visits the real file, 86 If this variable is t, VC follows the link and visits the real file,
74telling you about it in the echo area. If it is `ask', VC asks for 87telling you about it in the echo area. If it is `ask', VC asks for
75confirmation whether it should follow the link. If nil, the link is 88confirmation whether it should follow the link. If nil, the link is
76visited and a warning displayed.") 89visited and a warning displayed."
90 :type '(choice (const ask) (const nil) (const t))
91 :group 'vc)
77 92
78(defvar vc-display-status t 93(defcustom vc-display-status t
79 "*If non-nil, display revision number and lock status in modeline. 94 "*If non-nil, display revision number and lock status in modeline.
80Otherwise, not displayed.") 95Otherwise, not displayed."
96 :type 'boolean
97 :group 'vc)
98
81 99
82(defvar vc-consult-headers t 100(defcustom vc-consult-headers t
83 "*If non-nil, identify work files by searching for version headers.") 101 "*If non-nil, identify work files by searching for version headers."
102 :type 'boolean
103 :group 'vc)
84 104
85(defvar vc-keep-workfiles t 105(defcustom vc-keep-workfiles t
86 "*If non-nil, don't delete working files after registering changes. 106 "*If non-nil, don't delete working files after registering changes.
87If the back-end is CVS, workfiles are always kept, regardless of the 107If the back-end is CVS, workfiles are always kept, regardless of the
88value of this flag.") 108value of this flag."
109 :type 'boolean
110 :group 'vc)
89 111
90(defvar vc-mistrust-permissions nil 112(defcustom vc-mistrust-permissions nil
91 "*If non-nil, don't assume that permissions and ownership track 113 "*If non-nil, don't assume that permissions and ownership track
92version-control status. If nil, do rely on the permissions. 114version-control status. If nil, do rely on the permissions.
93See also variable `vc-consult-headers'.") 115See also variable `vc-consult-headers'."
116 :type 'boolean
117 :group 'vc)
94 118
95(defun vc-mistrust-permissions (file) 119(defun vc-mistrust-permissions (file)
96 ;; Access function to the above. 120 ;; Access function to the above.