diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-11-16 18:28:36 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-11-16 18:28:36 +0000 |
| commit | 66321b2fe29789f23ba907eadb4f3220d222630a (patch) | |
| tree | d96c38fec11daaf2b1b189b5a2c3ab53d297feb1 | |
| parent | fd06397593955e7fcb1bcd7bc181e789d4a41cdf (diff) | |
| download | emacs-66321b2fe29789f23ba907eadb4f3220d222630a.tar.gz | |
(vc-version-diff): Bind inhibit-read-only when inserting text.
(vc-version-backup-file): Docstring fix.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/vc.el | 18 |
2 files changed, 16 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1e15ba63b17..d33385e89df 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2000-11-16 Stefan Monnier <monnier@cs.yale.edu> + + * vc.el (vc-version-diff): Bind inhibit-read-only when inserting text. + (vc-version-backup-file): Docstring fix. + 2000-11-16 Gerd Moellmann <gerd@gnu.org> * files.el (basic-save-buffer): Don't add a newline if @@ -109,8 +114,7 @@ * calculator.el: New maintainer version. - * diff-mode.el (diff-imenu-generic-expression): Modify unidiff - pattern. + * diff-mode.el (diff-imenu-generic-expression): Modify unidiff pattern. * cmuscheme.el: Doc fixes. (cmuscheme) <defgroup>: Use `scheme' as parent. diff --git a/lisp/vc.el b/lisp/vc.el index 387088c96b1..6c4396a0d29 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -1,11 +1,11 @@ -;; vc.el --- drive a version-control system from within Emacs +;;; vc.el --- drive a version-control system from within Emacs ;; Copyright (C) 1992,93,94,95,96,97,98,2000 Free Software Foundation, Inc. ;; Author: FSF (see below for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> -;; $Id: vc.el,v 1.288 2000/11/16 16:40:59 spiegel Exp $ +;; $Id: vc.el,v 1.289 2000/11/16 18:17:26 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -1585,10 +1585,11 @@ files in or below it." ;; Gnus-5.8.5 sets up an autoload for diff-mode, even if it's ;; not available. Work around that. (if (require 'diff-mode nil t) (diff-mode)) - (vc-exec-after '(progn (if (eq (buffer-size) 0) - (insert "No differences found.\n")) - (goto-char (point-min)) - (shrink-window-if-larger-than-buffer))) + (vc-exec-after '(let ((inhibit-read-only t)) + (if (eq (buffer-size) 0) + (insert "No differences found.\n")) + (goto-char (point-min)) + (shrink-window-if-larger-than-buffer))) t)) ;;;###autoload @@ -2243,9 +2244,10 @@ changes found in the master file; use \\[universal-argument] \\[vc-next-action] (message "Reverting %s...done" file))) (defun vc-version-backup-file (file &optional rev) - "If version backups should be used for FILE, and there exists + "Return name of backup file for revision REV of FILE. +If version backups should be used for FILE, and there exists such a backup for REV or the current workfile version of file, -return the name of it; otherwise return nil." +return its name; otherwise return nil." (when (vc-call make-version-backups-p file) (let ((backup-file (vc-version-backup-file-name file rev))) (if (file-exists-p backup-file) |