[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc.el
From: |
Pavel Janík |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc.el |
Date: |
Mon, 26 Nov 2001 11:17:17 -0500 |
Index: emacs/lisp/vc.el
diff -u emacs/lisp/vc.el:1.322 emacs/lisp/vc.el:1.323
--- emacs/lisp/vc.el:1.322 Mon Nov 26 11:07:50 2001
+++ emacs/lisp/vc.el Mon Nov 26 11:17:17 2001
@@ -6,7 +6,7 @@
;; Maintainer: Andre Spiegel <address@hidden>
;; Keywords: tools
-;; $Id: vc.el,v 1.322 2001/11/26 16:07:50 spiegel Exp $
+;; $Id: vc.el,v 1.323 2001/11/26 16:17:17 pj 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.
- [Emacs-diffs] Changes to emacs/lisp/vc.el, Andre Spiegel, 2001/11/09
- [Emacs-diffs] Changes to emacs/lisp/vc.el, Andre Spiegel, 2001/11/09
- [Emacs-diffs] Changes to emacs/lisp/vc.el, Andre Spiegel, 2001/11/09
- [Emacs-diffs] Changes to emacs/lisp/vc.el, Sam Steingold, 2001/11/12
- [Emacs-diffs] Changes to emacs/lisp/vc.el, Andre Spiegel, 2001/11/14
- [Emacs-diffs] Changes to emacs/lisp/vc.el, Andre Spiegel, 2001/11/15
- [Emacs-diffs] Changes to emacs/lisp/vc.el, Andre Spiegel, 2001/11/15
- [Emacs-diffs] Changes to emacs/lisp/vc.el, Andre Spiegel, 2001/11/23
- [Emacs-diffs] Changes to emacs/lisp/vc.el, Andre Spiegel, 2001/11/26
- [Emacs-diffs] Changes to emacs/lisp/vc.el,
Pavel Janík <=