diff options
| author | Juanma Barranquero | 2002-10-17 15:46:06 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2002-10-17 15:46:06 +0000 |
| commit | f8b72742d00ce63b31ea064b679fc93e5086e0e1 (patch) | |
| tree | 729774e2efd379655e81914a10152fbf3a6cbacb | |
| parent | aa4af0714efe0607a383e5f605d3e56feb89c171 (diff) | |
| download | emacs-f8b72742d00ce63b31ea064b679fc93e5086e0e1.tar.gz emacs-f8b72742d00ce63b31ea064b679fc93e5086e0e1.zip | |
(vc-insert-file): Fix typo.
| -rw-r--r-- | lisp/vc-hooks.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index c8b9d2000c4..45aeed8bf6b 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.144 2002/09/04 20:45:34 spiegel Exp $ | 8 | ;; $Id: vc-hooks.el,v 1.145 2002/09/05 06:31:11 spiegel Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -170,7 +170,7 @@ VC commands are globally reachable under the prefix `\\[vc-prefix-map]': | |||
| 170 | 170 | ||
| 171 | (defun vc-find-backend-function (backend fun) | 171 | (defun vc-find-backend-function (backend fun) |
| 172 | "Return BACKEND-specific implementation of FUN. | 172 | "Return BACKEND-specific implementation of FUN. |
| 173 | If there is no such implementation, return the default implementation; | 173 | If there is no such implementation, return the default implementation; |
| 174 | if that doesn't exist either, return nil." | 174 | if that doesn't exist either, return nil." |
| 175 | (let ((f (vc-make-backend-sym backend fun))) | 175 | (let ((f (vc-make-backend-sym backend fun))) |
| 176 | (if (fboundp f) f | 176 | (if (fboundp f) f |
| @@ -217,7 +217,7 @@ It is usually called via the `vc-call' macro." | |||
| 217 | 217 | ||
| 218 | Optional argument LIMIT is a regexp. If present, the file is inserted | 218 | Optional argument LIMIT is a regexp. If present, the file is inserted |
| 219 | in chunks of size BLOCKSIZE (default 8 kByte), until the first | 219 | in chunks of size BLOCKSIZE (default 8 kByte), until the first |
| 220 | occurrence of LIMIT is found. Anything from the start of that occurence | 220 | occurrence of LIMIT is found. Anything from the start of that occurrence |
| 221 | to the end of the buffer is then deleted. The function returns | 221 | to the end of the buffer is then deleted. The function returns |
| 222 | non-nil if FILE exists and its contents were successfully inserted." | 222 | non-nil if FILE exists and its contents were successfully inserted." |
| 223 | (erase-buffer) | 223 | (erase-buffer) |
| @@ -268,7 +268,7 @@ backend is tried first." | |||
| 268 | (and (vc-call-backend b 'registered file) | 268 | (and (vc-call-backend b 'registered file) |
| 269 | (vc-file-setprop file 'vc-backend b) | 269 | (vc-file-setprop file 'vc-backend b) |
| 270 | (throw 'found t))) | 270 | (throw 'found t))) |
| 271 | (if (or (not backend) (eq backend 'none)) | 271 | (if (or (not backend) (eq backend 'none)) |
| 272 | vc-handled-backends | 272 | vc-handled-backends |
| 273 | (cons backend vc-handled-backends)))) | 273 | (cons backend vc-handled-backends)))) |
| 274 | ;; File is not registered. | 274 | ;; File is not registered. |
| @@ -351,7 +351,7 @@ For registered files, the value returned is one of: | |||
| 351 | 351 | ||
| 352 | USER The current version of the working file is locked by | 352 | USER The current version of the working file is locked by |
| 353 | some other USER (a string). | 353 | some other USER (a string). |
| 354 | 354 | ||
| 355 | 'needs-patch The file has not been edited by the user, but there is | 355 | 'needs-patch The file has not been edited by the user, but there is |
| 356 | a more recent version on the current branch stored | 356 | a more recent version on the current branch stored |
| 357 | in the master file. | 357 | in the master file. |
| @@ -501,8 +501,8 @@ a regexp for matching all such backup files, regardless of the version." | |||
| 501 | (if regexp | 501 | (if regexp |
| 502 | (concat (regexp-quote (file-name-nondirectory file)) | 502 | (concat (regexp-quote (file-name-nondirectory file)) |
| 503 | "\\.~[0-9.]+" (unless manual "\\.") "~") | 503 | "\\.~[0-9.]+" (unless manual "\\.") "~") |
| 504 | (expand-file-name (concat (file-name-nondirectory file) | 504 | (expand-file-name (concat (file-name-nondirectory file) |
| 505 | ".~" (or rev (vc-workfile-version file)) | 505 | ".~" (or rev (vc-workfile-version file)) |
| 506 | (unless manual ".") "~") | 506 | (unless manual ".") "~") |
| 507 | (file-name-directory file)))) | 507 | (file-name-directory file)))) |
| 508 | 508 | ||
| @@ -658,7 +658,7 @@ current, and kill the buffer that visits the link." | |||
| 658 | (get-file-buffer | 658 | (get-file-buffer |
| 659 | (abbreviate-file-name | 659 | (abbreviate-file-name |
| 660 | (file-chase-links buffer-file-name)))) | 660 | (file-chase-links buffer-file-name)))) |
| 661 | 661 | ||
| 662 | (vc-follow-link) | 662 | (vc-follow-link) |
| 663 | (message "Followed link to %s" buffer-file-name) | 663 | (message "Followed link to %s" buffer-file-name) |
| 664 | (vc-find-file-hook)) | 664 | (vc-find-file-hook)) |