comparison lisp/vc.el @ 41561:cfae9c0a0035

(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 678f91af978a
children 7308bbc423d5
comparison
equal deleted inserted replaced
41560:7428670426b2 41561:cfae9c0a0035
4 4
5 ;; Author: FSF (see below for full credits) 5 ;; Author: FSF (see below for full credits)
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
13 ;; GNU Emacs is free software; you can redistribute it and/or modify 13 ;; GNU Emacs is free software; you can redistribute it and/or modify
14 ;; it under the terms of the GNU General Public License as published by 14 ;; it under the terms of the GNU General Public License as published by
1199 (if (not visited) (find-file-other-window file)) 1199 (if (not visited) (find-file-other-window file))
1200 (if (save-window-excursion 1200 (if (save-window-excursion
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. "
1208 "Claim lock retaining changes? "))) 1208 "Claim lock retaining changes? ")))
1209 (progn (vc-call steal-lock file) 1209 (progn (vc-call steal-lock file)
2150 There is a special command, `*l', to mark all files currently locked." 2150 There is a special command, `*l', to mark all files currently locked."
2151 ;; define-derived-mode does it for us in Emacs-21, but not in Emacs-20. 2151 ;; define-derived-mode does it for us in Emacs-21, but not in Emacs-20.
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.
2159 (set (make-local-variable 'dired-move-to-filename-regexp) 2158 (set (make-local-variable 'dired-move-to-filename-regexp)
2160 (let* 2159 (let*