diff options
| author | Pavel Janík | 2001-11-26 16:17:17 +0000 |
|---|---|---|
| committer | Pavel Janík | 2001-11-26 16:17:17 +0000 |
| commit | f4f34b33e164707c139b4be5e65edcab0dd7ef2b (patch) | |
| tree | 930392d3c07e77861bb77c665de8f9d79ef7547c | |
| parent | 8b78491a457a2e790cbe934fb4d7b4d73feb080a (diff) | |
| download | emacs-f4f34b33e164707c139b4be5e65edcab0dd7ef2b.tar.gz emacs-f4f34b33e164707c139b4be5e65edcab0dd7ef2b.zip | |
(vc-next-action-on-file): Use insert instead of insert-string.
| -rw-r--r-- | lisp/vc.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 2db97de8041..7288b93935b 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | ;; Keywords: tools | 7 | ;; Keywords: tools |
| 8 | 8 | ||
| 9 | ;; $Id: vc.el,v 1.321 2001/11/23 10:11:29 spiegel Exp $ | 9 | ;; $Id: vc.el,v 1.322 2001/11/26 16:07:50 spiegel Exp $ |
| 10 | 10 | ||
| 11 | ;; This file is part of GNU Emacs. | 11 | ;; This file is part of GNU Emacs. |
| 12 | 12 | ||
| @@ -1201,7 +1201,7 @@ If VERBOSE is non-nil, query the user rather than using default parameters." | |||
| 1201 | (vc-version-diff file (vc-workfile-version file) nil) | 1201 | (vc-version-diff file (vc-workfile-version file) nil) |
| 1202 | (goto-char (point-min)) | 1202 | (goto-char (point-min)) |
| 1203 | (let ((inhibit-read-only t)) | 1203 | (let ((inhibit-read-only t)) |
| 1204 | (insert-string | 1204 | (insert |
| 1205 | (format "Changes to %s since last lock:\n\n" file))) | 1205 | (format "Changes to %s since last lock:\n\n" file))) |
| 1206 | (not (beep)) | 1206 | (not (beep)) |
| 1207 | (yes-or-no-p (concat "File has unlocked changes. " | 1207 | (yes-or-no-p (concat "File has unlocked changes. " |
| @@ -2152,7 +2152,6 @@ There is a special command, `*l', to mark all files currently locked." | |||
| 2152 | ;; We do it here because dired might not be loaded yet | 2152 | ;; We do it here because dired might not be loaded yet |
| 2153 | ;; when vc-dired-mode-map is initialized. | 2153 | ;; when vc-dired-mode-map is initialized. |
| 2154 | (set-keymap-parent vc-dired-mode-map dired-mode-map) | 2154 | (set-keymap-parent vc-dired-mode-map dired-mode-map) |
| 2155 | (make-local-hook 'dired-after-readin-hook) | ||
| 2156 | (add-hook 'dired-after-readin-hook 'vc-dired-hook nil t) | 2155 | (add-hook 'dired-after-readin-hook 'vc-dired-hook nil t) |
| 2157 | ;; The following is slightly modified from dired.el, | 2156 | ;; The following is slightly modified from dired.el, |
| 2158 | ;; because file lines look a bit different in vc-dired-mode. | 2157 | ;; because file lines look a bit different in vc-dired-mode. |