Mercurial > emacs
comparison lisp/vc.el @ 1636:c2bea3f2f8cb
(vc-next-action): Undo previous change.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 20 Nov 1992 19:33:38 +0000 |
parents | e3c02a517030 |
children | 75e8a7f920c7 |
comparison
equal
deleted
inserted
replaced
1635:e3c02a517030 | 1636:c2bea3f2f8cb |
---|---|
3 ;; Copyright (C) 1992 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1992 Free Software Foundation, Inc. |
4 | 4 |
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | 5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> |
6 ;; Version: 4.0 | 6 ;; Version: 4.0 |
7 | 7 |
8 ;; $Id: vc.el,v 1.16 1992/11/08 18:58:17 rms Exp jimb $ | 8 ;; $Id: vc.el,v 1.17 1992/11/20 17:23:45 jimb Exp rms $ |
9 | 9 |
10 ;; This file is part of GNU Emacs. | 10 ;; This file is part of GNU Emacs. |
11 | 11 |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | 12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
13 ;; it under the terms of the GNU General Public License as published by | 13 ;; it under the terms of the GNU General Public License as published by |
317 ;; after finishing the log entry. | 317 ;; after finishing the log entry. |
318 (if (and (vc-workfile-unchanged-p file) | 318 (if (and (vc-workfile-unchanged-p file) |
319 (not (buffer-modified-p))) | 319 (not (buffer-modified-p))) |
320 (progn | 320 (progn |
321 (vc-backend-revert file) | 321 (vc-backend-revert file) |
322 (vc-resynch-window file t t)) | 322 ;; DO NOT revert the file without asking the user! |
323 (vc-resynch-window file t nil)) | |
323 | 324 |
324 ;; user may want to set nonstandard parameters | 325 ;; user may want to set nonstandard parameters |
325 (if verbose | 326 (if verbose |
326 (setq version (read-string "New version level: "))) | 327 (setq version (read-string "New version level: "))) |
327 | 328 |