diff options
| author | Richard M. Stallman | 1997-07-18 19:03:30 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-07-18 19:03:30 +0000 |
| commit | b6e7b3c6cabb12da0d69bed715b49670df7b847d (patch) | |
| tree | 30a4fab15ef208b19e147f270608d5013c7dfee1 | |
| parent | df816618ed2ad87e16adba399e523c6c48607eac (diff) | |
| download | emacs-b6e7b3c6cabb12da0d69bed715b49670df7b847d.tar.gz emacs-b6e7b3c6cabb12da0d69bed715b49670df7b847d.zip | |
(vc-diff): Turn off previous change.
| -rw-r--r-- | lisp/vc.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 3c160132af2..900eae7aee8 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -1253,7 +1253,8 @@ and two version designators specifying which versions to compare." | |||
| 1253 | "There is no version-control master associated with this buffer")) | 1253 | "There is no version-control master associated with this buffer")) |
| 1254 | (let ((file buffer-file-name) | 1254 | (let ((file buffer-file-name) |
| 1255 | unchanged) | 1255 | unchanged) |
| 1256 | (if (not (vc-locking-user file)) | 1256 | (if nil ;;; (not (vc-locking-user file)) |
| 1257 | ;; This seems like feeping creaturism -- rms. | ||
| 1257 | ;; if the file is not locked, ask for older version to compare with | 1258 | ;; if the file is not locked, ask for older version to compare with |
| 1258 | (let ((old (read-string | 1259 | (let ((old (read-string |
| 1259 | "File is unchanged; version to compare with: "))) | 1260 | "File is unchanged; version to compare with: "))) |