Mercurial > emacs
annotate lisp/vc-hooks.el @ 4024:b9f3b023e5c9
(vc-rcs-status): Remove unused var `status'.
author | Paul Eggert <eggert@twinsun.com> |
---|---|
date | Wed, 07 Jul 1993 19:07:54 +0000 |
parents | c24f84e2f019 |
children | cebb261b0f10 |
rev | line source |
---|---|
2232
4f9d60f7de9d
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2227
diff
changeset
|
1 ;;; vc-hooks.el --- resident support for version-control |
904 | 2 |
4024
b9f3b023e5c9
(vc-rcs-status): Remove unused var `status'.
Paul Eggert <eggert@twinsun.com>
parents:
3989
diff
changeset
|
3 ;; Copyright (C) 1992, 1993 Free Software Foundation, Inc. |
904 | 4 |
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
6 ;; Version: 5.3 |
904 | 7 |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
12 ;; the Free Software Foundation; either version 2, or (at your option) | |
13 ;; any later version. | |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
22 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
23 | |
24 ;;; Commentary: | |
25 | |
26 ;; See the commentary of vc.el. | |
27 | |
28 ;;; Code: | |
29 | |
30 (defvar vc-master-templates | |
31 '(("%sRCS/%s,v" . RCS) ("%s%s,v" . RCS) ("%sRCS/%s" . RCS) | |
32 ("%sSCCS/s.%s" . SCCS) ("%ss.%s". SCCS)) | |
33 "*Where to look for version-control master files. | |
34 The first pair corresponding to a given back end is used as a template | |
35 when creating new masters.") | |
36 | |
37 (defvar vc-make-backup-files nil | |
38 "*If non-nil, backups of registered files are made according to | |
39 the make-backup-files variable. Otherwise, prevents backups being made.") | |
40 | |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
41 (defvar vc-rcs-status t |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
42 "*If non-nil, revision and locks on RCS working file displayed in modeline. |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
43 Otherwise, not displayed.") |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
44 |
904 | 45 ;; Tell Emacs about this new kind of minor mode |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
46 (if (not (assoc 'vc-mode minor-mode-alist)) |
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
47 (setq minor-mode-alist (cons '(vc-mode vc-mode) |
904 | 48 minor-mode-alist))) |
49 | |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
50 (make-variable-buffer-local 'vc-mode) |
2620
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
51 (put 'vc-mode 'permanent-local t) |
904 | 52 |
53 ;; We need a notion of per-file properties because the version | |
54 ;; control state of a file is expensive to derive --- we don't | |
55 ;; want to recompute it even on every find. | |
56 | |
2213
9ff513b5d296
vc-error-occurred: moved to vc-hooks.el in order for ^X^F of a
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1951
diff
changeset
|
57 (defmacro vc-error-occurred (&rest body) |
9ff513b5d296
vc-error-occurred: moved to vc-hooks.el in order for ^X^F of a
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1951
diff
changeset
|
58 (list 'condition-case nil (cons 'progn (append body '(nil))) '(error t))) |
9ff513b5d296
vc-error-occurred: moved to vc-hooks.el in order for ^X^F of a
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1951
diff
changeset
|
59 |
904 | 60 (defvar vc-file-prop-obarray [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] |
61 "Obarray for per-file properties.") | |
62 | |
63 (defun vc-file-setprop (file property value) | |
64 ;; set per-file property | |
65 (put (intern file vc-file-prop-obarray) property value)) | |
66 | |
67 (defun vc-file-getprop (file property) | |
68 ;; get per-file property | |
69 (get (intern file vc-file-prop-obarray) property)) | |
70 | |
71 ;;; actual version-control code starts here | |
72 | |
73 (defun vc-registered (file) | |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
74 (let (handler handlers) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
75 (if (boundp 'file-name-handler-alist) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
76 (save-match-data |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
77 (setq handlers file-name-handler-alist) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
78 (while (and (consp handlers) (null handler)) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
79 (if (and (consp (car handlers)) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
80 (stringp (car (car handlers))) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
81 (string-match (car (car handlers)) file)) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
82 (setq handler (cdr (car handlers)))) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
83 (setq handlers (cdr handlers))))) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
84 (if handler |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
85 (funcall handler 'vc-registered file) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
86 ;; Search for a master corresponding to the given file |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
87 (let ((dirname (or (file-name-directory file) "")) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
88 (basename (file-name-nondirectory file))) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
89 (catch 'found |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
90 (mapcar |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
91 (function (lambda (s) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
92 (let ((trial (format (car s) dirname basename))) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
93 (if (and (file-exists-p trial) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
94 ;; Make sure the file we found with name |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
95 ;; TRIAL is not the source file itself. |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
96 ;; That can happen with RCS-style names |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
97 ;; if the file name is truncated |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
98 ;; (e.g. to 14 chars). See if either |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
99 ;; directory or attributes differ. |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
100 (or (not (string= dirname |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
101 (file-name-directory trial))) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
102 (not (equal |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
103 (file-attributes file) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
104 (file-attributes trial))))) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
105 (throw 'found (cons trial (cdr s))))))) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
106 vc-master-templates) |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
107 nil))))) |
904 | 108 |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
109 (defun vc-name (file) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
110 "Return the master name of a file, nil if it is not registered." |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
111 (or (vc-file-getprop file 'vc-name) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
112 (let ((name-and-type (vc-registered file))) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
113 (if name-and-type |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
114 (progn |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
115 (vc-file-setprop file 'vc-backend (cdr name-and-type)) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
116 (vc-file-setprop file 'vc-name (car name-and-type))))))) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
117 |
904 | 118 (defun vc-backend-deduce (file) |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
119 "Return the version-control type of a file, nil if it is not registered." |
904 | 120 (and file |
121 (or (vc-file-getprop file 'vc-backend) | |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
122 (let ((name-and-type (vc-registered file))) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
123 (if name-and-type |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
124 (progn |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
125 (vc-file-setprop file 'vc-name (car name-and-type)) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
126 (vc-file-setprop file 'vc-backend (cdr name-and-type)))))))) |
904 | 127 |
128 (defun vc-toggle-read-only () | |
2620
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
129 "Change read-only status of current buffer, perhaps via version control. |
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
130 If the buffer is visiting a file registered with version control, |
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
131 then check the file in or out. Otherwise, just change the read-only flag |
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
132 of the buffer." |
904 | 133 (interactive) |
134 (if (vc-backend-deduce (buffer-file-name)) | |
135 (vc-next-action nil) | |
136 (toggle-read-only))) | |
2620
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
137 (define-key global-map "\C-x\C-q" 'vc-toggle-read-only) |
904 | 138 |
139 (defun vc-mode-line (file &optional label) | |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
140 "Set `vc-mode' to display type of version control for FILE. |
904 | 141 The value is set in the current buffer, which should be the buffer |
142 visiting FILE." | |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
143 (interactive (list buffer-file-name nil)) |
904 | 144 (let ((vc-type (vc-backend-deduce file))) |
145 (if vc-type | |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
146 (setq vc-mode |
3974
cd0cc37be860
(vc-mode-line): Put `RCS' or `SCCS' before version num.
Richard M. Stallman <rms@gnu.org>
parents:
3900
diff
changeset
|
147 (concat " " (or label (symbol-name vc-type)) |
cd0cc37be860
(vc-mode-line): Put `RCS' or `SCCS' before version num.
Richard M. Stallman <rms@gnu.org>
parents:
3900
diff
changeset
|
148 (if (and vc-rcs-status (eq vc-type 'RCS)) |
cd0cc37be860
(vc-mode-line): Put `RCS' or `SCCS' before version num.
Richard M. Stallman <rms@gnu.org>
parents:
3900
diff
changeset
|
149 (vc-rcs-status file))))) |
904 | 150 ;; force update of mode line |
151 (set-buffer-modified-p (buffer-modified-p)) | |
152 vc-type)) | |
153 | |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
154 (defun vc-rcs-status (file) |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
155 ;; Return string " [LOCKER:REV]" if FILE under RCS control, otherwise nil, |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
156 ;; for placement in modeline by `vc-mode-line'. |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
157 |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
158 ;; If FILE is not locked then return just "". If the FILE is locked |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
159 ;; then return *all* the locks currently set, in a single string of the |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
160 ;; form " LOCKER1:REV1 LOCKER2:REV2 ...". |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
161 |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
162 ;; Algorithm: |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
163 |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
164 ;; 1. Check for master file corresponding to FILE being visited. |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
165 ;; |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
166 ;; 2. Insert the first few characters of the master file into a work |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
167 ;; buffer. |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
168 ;; |
4024
b9f3b023e5c9
(vc-rcs-status): Remove unused var `status'.
Paul Eggert <eggert@twinsun.com>
parents:
3989
diff
changeset
|
169 ;; 3. Search work buffer for "locks...;" phrase; if not found, then |
b9f3b023e5c9
(vc-rcs-status): Remove unused var `status'.
Paul Eggert <eggert@twinsun.com>
parents:
3989
diff
changeset
|
170 ;; keep inserting more characters until the phrase is found. |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
171 ;; |
4024
b9f3b023e5c9
(vc-rcs-status): Remove unused var `status'.
Paul Eggert <eggert@twinsun.com>
parents:
3989
diff
changeset
|
172 ;; 4. Extract the locks, and remove control characters |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
173 ;; separating them, like newlines; the string " user1:revision1 |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
174 ;; user2:revision2 ..." is returned. |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
175 |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
176 ;; Limitations: |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
177 |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
178 ;; The output doesn't show which version you are actually looking at. |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
179 ;; The modeline can get quite cluttered when there are multiple locks. |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
180 |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
181 (let ((master (vc-name file)) |
4024
b9f3b023e5c9
(vc-rcs-status): Remove unused var `status'.
Paul Eggert <eggert@twinsun.com>
parents:
3989
diff
changeset
|
182 found) |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
183 |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
184 ;; If master file exists, then parse its contents, otherwise we return the |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
185 ;; nil value of this if form. |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
186 (if master |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
187 (save-excursion |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
188 |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
189 ;; Create work buffer. |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
190 (set-buffer (get-buffer-create "*vc-rcs-status*")) |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
191 (setq buffer-read-only nil |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
192 default-directory (file-name-directory master)) |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
193 (erase-buffer) |
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
194 |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
195 ;; Check if we have enough of the header. |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
196 ;; If not, then keep including more. |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
197 (while |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
198 (not (or found |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
199 (let ((s (buffer-size))) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
200 (goto-char (1+ s)) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
201 (zerop (car (cdr (insert-file-contents |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
202 master nil s (+ s 8192)))))))) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
203 (beginning-of-line) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
204 (setq found (re-search-forward "^locks\\([^;]*\\);" nil t))) |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
205 |
3989
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
206 (if found |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
207 ;; Clean control characters from text. |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
208 (let ((status |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
209 (save-restriction |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
210 (narrow-to-region (match-beginning 1) (match-end 1)) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
211 (goto-char (point-min)) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
212 (while (re-search-forward "[ \b\t\n\v\f\r]+" nil t) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
213 (replace-match " " t t)) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
214 (buffer-string)))) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
215 ;; Clean work buffer. |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
216 (erase-buffer) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
217 (set-buffer-modified-p nil) |
c24f84e2f019
(vc-name): Moved from vc.el; vc-rcs-status now uses it.
Paul Eggert <eggert@twinsun.com>
parents:
3974
diff
changeset
|
218 status)))))) |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
219 |
904 | 220 ;;; install a call to the above as a find-file hook |
221 (defun vc-find-file-hook () | |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
222 ;; Recompute whether file is version controlled, |
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
223 ;; if user has killed the buffer and revisited. |
3459
763bc1ba714e
(vc-find-file-hook): Check buffer-file-name is non-nil.
Richard M. Stallman <rms@gnu.org>
parents:
2620
diff
changeset
|
224 (if buffer-file-name |
763bc1ba714e
(vc-find-file-hook): Check buffer-file-name is non-nil.
Richard M. Stallman <rms@gnu.org>
parents:
2620
diff
changeset
|
225 (vc-file-setprop buffer-file-name 'vc-backend nil)) |
904 | 226 (if (and (vc-mode-line buffer-file-name) (not vc-make-backup-files)) |
227 (progn | |
228 (make-local-variable 'make-backup-files) | |
229 (setq make-backup-files nil)))) | |
230 | |
231 (or (memq 'vc-find-file-hook find-file-hooks) | |
232 (setq find-file-hooks | |
233 (cons 'vc-find-file-hook find-file-hooks))) | |
234 | |
235 ;;; more hooks, this time for file-not-found | |
236 (defun vc-file-not-found-hook () | |
237 "When file is not found, try to check it out from RCS or SCCS. | |
238 Returns t if checkout was successful, nil otherwise." | |
239 (if (vc-backend-deduce buffer-file-name) | |
240 (progn | |
241 (require 'vc) | |
242 (not (vc-error-occurred (vc-checkout buffer-file-name)))))) | |
243 | |
244 (or (memq 'vc-file-not-found-hook find-file-not-found-hooks) | |
245 (setq find-file-not-found-hooks | |
246 (cons 'vc-file-not-found-hook find-file-not-found-hooks))) | |
247 | |
248 ;;; Now arrange for bindings and autoloading of the main package. | |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
249 ;;; Bindings for this have to go in the global map, as we'll often |
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
250 ;;; want to call them from random buffers. |
904 | 251 |
252 (setq vc-prefix-map (lookup-key global-map "\C-xv")) | |
253 (if (not (keymapp vc-prefix-map)) | |
254 (progn | |
255 (setq vc-prefix-map (make-sparse-keymap)) | |
256 (define-key global-map "\C-xv" vc-prefix-map) | |
257 (define-key vc-prefix-map "a" 'vc-update-change-log) | |
258 (define-key vc-prefix-map "c" 'vc-cancel-version) | |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
259 (define-key vc-prefix-map "d" 'vc-directory) |
904 | 260 (define-key vc-prefix-map "h" 'vc-insert-headers) |
261 (define-key vc-prefix-map "i" 'vc-register) | |
262 (define-key vc-prefix-map "l" 'vc-print-log) | |
263 (define-key vc-prefix-map "r" 'vc-retrieve-snapshot) | |
264 (define-key vc-prefix-map "s" 'vc-create-snapshot) | |
265 (define-key vc-prefix-map "u" 'vc-revert-buffer) | |
266 (define-key vc-prefix-map "v" 'vc-next-action) | |
2218
13be90dfef0c
Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents:
2213
diff
changeset
|
267 (define-key vc-prefix-map "=" 'vc-diff) |
904 | 268 )) |
269 | |
270 (provide 'vc-hooks) | |
271 | |
272 ;;; vc-hooks.el ends here |