diff options
| author | Pavel Janík <Pavel@Janik.cz> | 2001-11-26 16:17:17 +0000 |
|---|---|---|
| committer | Pavel Janík <Pavel@Janik.cz> | 2001-11-26 16:17:17 +0000 |
| commit | f4f34b33e164707c139b4be5e65edcab0dd7ef2b (patch) | |
| tree | 930392d3c07e77861bb77c665de8f9d79ef7547c /lisp/vc.el | |
| parent | 8b78491a457a2e790cbe934fb4d7b4d73feb080a (diff) | |
| download | emacs-f4f34b33e164707c139b4be5e65edcab0dd7ef2b.tar.gz | |
(vc-next-action-on-file): Use insert instead of insert-string.
Diffstat (limited to 'lisp/vc.el')
| -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 @@ ;; Maintainer: Andre Spiegel <spiegel@gnu.org> ;; Keywords: tools -;; $Id: vc.el,v 1.321 2001/11/23 10:11:29 spiegel Exp $ +;; $Id: vc.el,v 1.322 2001/11/26 16:07:50 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -1201,7 +1201,7 @@ If VERBOSE is non-nil, query the user rather than using default parameters." (vc-version-diff file (vc-workfile-version file) nil) (goto-char (point-min)) (let ((inhibit-read-only t)) - (insert-string + (insert (format "Changes to %s since last lock:\n\n" file))) (not (beep)) (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." ;; We do it here because dired might not be loaded yet ;; when vc-dired-mode-map is initialized. (set-keymap-parent vc-dired-mode-map dired-mode-map) - (make-local-hook 'dired-after-readin-hook) (add-hook 'dired-after-readin-hook 'vc-dired-hook nil t) ;; The following is slightly modified from dired.el, ;; because file lines look a bit different in vc-dired-mode. |