Mercurial > emacs

changeset 41561:cfae9c0a0035

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-next-action-on-file): Use insert instead of insert-string.
author Pavel Janík <Pavel@Janik.cz>
date Mon, 26 Nov 2001 16:17:17 +0000
parents 7428670426b2
children 62c9f562dc40
files lisp/vc.el
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc.el	Mon Nov 26 16:16:45 2001 +0000
+++ b/lisp/vc.el	Mon Nov 26 16:17:17 2001 +0000
@@ -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 @@
 	      (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 @@
   ;; 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.