procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(vc-version-diff): Bind inhibit-read-only when inserting text.

Browse source 
(vc-version-backup-file): Docstring fix.
This commit is contained in:
Stefan Monnier 2000-11-16 18:28:36 +00:00
parent fd06397593
commit 66321b2fe2
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -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.

18
lisp/vc.el
View file

@ -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)