comparison lisp/vc.el @ 46623:9ed0e3821f7a

(vc-next-action-on-file): Preserve find-file-literally.

46622:7ac7ae3b6a36

;; Author:     FSF (see below for full credits)
;; Maintainer: Andre Spiegel <[e-mail]>
;; Keywords: tools

;; $Id: vc.el,v 1.333 2002/07/16 20:44:23 monnier Exp $

;; This file is part of GNU Emacs.

;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by

If COMMENT is specified, it will be used as an admin or checkin comment.
If VERBOSE is non-nil, query the user rather than using default parameters."
  (let ((visited (get-file-buffer file))
	state version)
    (when visited
      ;; Check relation of buffer and file, and make sure
      ;; user knows what he's doing.  First, finding the file
      ;; will check whether the file on disk is newer.
      (set-buffer visited)
      ;; ignore buffer-read-only during this test
      (let ((buffer-read-only (not (file-writable-p file))))
        (if vc-dired-mode
            (find-file-other-window file)
          (find-file-noselect file)))
      (if (not (verify-visited-file-modtime (current-buffer)))
	  (if (yes-or-no-p "Replace file on disk with buffer contents? ")
	      (write-file (buffer-file-name))
	    (error "Aborted"))
	;; Now, check if we have unsaved changes.

46623:9ed0e3821f7a

;; Author:     FSF (see below for full credits)
;; Maintainer: Andre Spiegel <[e-mail]>
;; Keywords: tools

;; $Id: vc.el,v 1.334 2002/07/19 13:20:02 spiegel Exp $

;; This file is part of GNU Emacs.

;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by

If COMMENT is specified, it will be used as an admin or checkin comment.
If VERBOSE is non-nil, query the user rather than using default parameters."
  (let ((visited (get-file-buffer file))
	state version)
    (when visited
      (if vc-dired-mode
          (switch-to-buffer-other-window visited)
        (set-buffer visited))
      ;; Check relation of buffer and file, and make sure
      ;; user knows what he's doing.  First, finding the file
      ;; will check whether the file on disk is newer.
      ;; Ignore buffer-read-only during this test, and
      ;; preserve find-file-literally.
      (let ((buffer-read-only (not (file-writable-p file))))
        (find-file-noselect file nil find-file-literally))
      (if (not (verify-visited-file-modtime (current-buffer)))
	  (if (yes-or-no-p "Replace file on disk with buffer contents? ")
	      (write-file (buffer-file-name))
	    (error "Aborted"))
	;; Now, check if we have unsaved changes.