Mercurial > emacs
comparison lisp/vc.el @ 51245:f6920b201e1c
(vc-delete-file): Fix free variable reference.
(vc-annotate-display): Remove obsolesence declaration; it isn't
obsolete.
author | André Spiegel <spiegel@gnu.org> |
---|---|
date | Mon, 26 May 2003 10:33:00 +0000 |
parents | f2383fb5260e |
children | 91b1fb194872 |
comparison
equal
deleted
inserted
replaced
51244:18df58e3c486 | 51245:f6920b201e1c |
---|---|
5 | 5 |
6 ;; Author: FSF (see below for full credits) | 6 ;; Author: FSF (see below for full credits) |
7 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 7 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
8 ;; Keywords: tools | 8 ;; Keywords: tools |
9 | 9 |
10 ;; $Id: vc.el,v 1.352 2003/05/09 16:33:10 monnier Exp $ | 10 ;; $Id: vc.el,v 1.353 2003/05/18 02:53:24 monnier Exp $ |
11 | 11 |
12 ;; This file is part of GNU Emacs. | 12 ;; This file is part of GNU Emacs. |
13 | 13 |
14 ;; GNU Emacs is free software; you can redistribute it and/or modify | 14 ;; GNU Emacs is free software; you can redistribute it and/or modify |
15 ;; it under the terms of the GNU General Public License as published by | 15 ;; it under the terms of the GNU General Public License as published by |
2664 (error "New file lacks a version control directory"))))) | 2664 (error "New file lacks a version control directory"))))) |
2665 | 2665 |
2666 (defun vc-delete-file (file) | 2666 (defun vc-delete-file (file) |
2667 "Delete file and mark it as such in the version control system." | 2667 "Delete file and mark it as such in the version control system." |
2668 (interactive "fVC delete file: ") | 2668 (interactive "fVC delete file: ") |
2669 (let ((buf (get-file-buffer file))) | 2669 (let ((buf (get-file-buffer file)) |
2670 (backend (vc-backend file))) | |
2671 (unless backend | |
2672 (error "File %s is not under version control" | |
2673 (file-name-nondirectory file))) | |
2670 (unless (vc-find-backend-function backend 'delete-file) | 2674 (unless (vc-find-backend-function backend 'delete-file) |
2671 (error "Renaming files under %s is not supported in VC" backend)) | 2675 (error "Deleting files under %s is not supported in VC" backend)) |
2672 (if (and buf (buffer-modified-p buf)) | 2676 (if (and buf (buffer-modified-p buf)) |
2673 (error "Please save files before deleting them")) | 2677 (error "Please save files before deleting them")) |
2674 (unless (y-or-n-p (format "Really want to delete %s ? " | 2678 (unless (y-or-n-p (format "Really want to delete %s ? " |
2675 (file-name-nondirectory file))) | 2679 (file-name-nondirectory file))) |
2676 (error "Abort!")) | 2680 (error "Abort!")) |
3077 The annotations are relative to the current time, unless overridden by OFFSET." | 3081 The annotations are relative to the current time, unless overridden by OFFSET." |
3078 (if (and color-map (not (eq color-map vc-annotate-color-map))) | 3082 (if (and color-map (not (eq color-map vc-annotate-color-map))) |
3079 (set (make-local-variable 'vc-annotate-color-map) color-map)) | 3083 (set (make-local-variable 'vc-annotate-color-map) color-map)) |
3080 (set (make-local-variable 'vc-annotate-offset) offset) | 3084 (set (make-local-variable 'vc-annotate-offset) offset) |
3081 (font-lock-mode 1)) | 3085 (font-lock-mode 1)) |
3082 (make-obsolete 'vc-annotate-display 'vc-annotate-display-select "21.4") | |
3083 | 3086 |
3084 (defvar vc-annotate-offset nil) | 3087 (defvar vc-annotate-offset nil) |
3085 | 3088 |
3086 (defun vc-annotate-lines (limit) | 3089 (defun vc-annotate-lines (limit) |
3087 (let (difference) | 3090 (let (difference) |