diff options
| -rw-r--r-- | lisp/vc-hooks.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 24c16e4b0d8..ceb6a325eec 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el | |||
| @@ -5,7 +5,7 @@ | |||
| 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-hooks.el,v 1.138 2002/02/21 20:56:58 spiegel Exp $ | 8 | ;; $Id: vc-hooks.el,v 1.139 2002/02/28 13:09:36 spiegel Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -311,11 +311,11 @@ For registered files, the possible values are: | |||
| 311 | when the user saves the first changes to the file. | 311 | when the user saves the first changes to the file. |
| 312 | 312 | ||
| 313 | 'locking FILE is read-only if up-to-date; user must type | 313 | 'locking FILE is read-only if up-to-date; user must type |
| 314 | \\[vc-toggle-read-only] before editing. Strict locking | 314 | \\[vc-next-action] before editing. Strict locking |
| 315 | is assumed. | 315 | is assumed. |
| 316 | 316 | ||
| 317 | 'announce FILE is read-only if up-to-date; user must type | 317 | 'announce FILE is read-only if up-to-date; user must type |
| 318 | \\[vc-toggle-read-only] before editing. But other users | 318 | \\[vc-next-action] before editing. But other users |
| 319 | may be editing at the same time." | 319 | may be editing at the same time." |
| 320 | (or (vc-file-getprop file 'vc-checkout-model) | 320 | (or (vc-file-getprop file 'vc-checkout-model) |
| 321 | (if (vc-backend file) | 321 | (if (vc-backend file) |
| @@ -453,19 +453,22 @@ this function." | |||
| 453 | 453 | ||
| 454 | (defun vc-toggle-read-only (&optional verbose) | 454 | (defun vc-toggle-read-only (&optional verbose) |
| 455 | "Change read-only status of current buffer, perhaps via version control. | 455 | "Change read-only status of current buffer, perhaps via version control. |
| 456 | |||
| 456 | If the buffer is visiting a file registered with version control, | 457 | If the buffer is visiting a file registered with version control, |
| 457 | then check the file in or out. Otherwise, just change the read-only flag | 458 | then check the file in or out. Otherwise, just change the read-only flag |
| 458 | of the buffer. | 459 | of the buffer. |
| 459 | With prefix argument, ask for version number to check in or check out. | 460 | With prefix argument, ask for version number to check in or check out. |
| 460 | Check-out of a specified version number does not lock the file; | 461 | Check-out of a specified version number does not lock the file; |
| 461 | to do that, use this command a second time with no argument." | 462 | to do that, use this command a second time with no argument. |
| 463 | |||
| 464 | If you bind this function to \\[toggle-read-only], then Emacs checks files | ||
| 465 | in or out whenever you toggle the read-only flag." | ||
| 462 | (interactive "P") | 466 | (interactive "P") |
| 463 | (if (or (and (boundp 'vc-dired-mode) vc-dired-mode) | 467 | (if (or (and (boundp 'vc-dired-mode) vc-dired-mode) |
| 464 | ;; use boundp because vc.el might not be loaded | 468 | ;; use boundp because vc.el might not be loaded |
| 465 | (vc-backend (buffer-file-name))) | 469 | (vc-backend (buffer-file-name))) |
| 466 | (vc-next-action verbose) | 470 | (vc-next-action verbose) |
| 467 | (toggle-read-only))) | 471 | (toggle-read-only))) |
| 468 | (define-key global-map "\C-x\C-q" 'vc-toggle-read-only) | ||
| 469 | 472 | ||
| 470 | (defun vc-default-make-version-backups-p (backend file) | 473 | (defun vc-default-make-version-backups-p (backend file) |
| 471 | "Return non-nil if unmodified versions should be backed up locally. | 474 | "Return non-nil if unmodified versions should be backed up locally. |