summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-07-18 19:03:30 +0000
committerRichard M. Stallman <rms@gnu.org>1997-07-18 19:03:30 +0000
commit68456b5bd21cc15d095d0a3f23682903f065653b (patch)
tree42cfb49fc3c96a639ac5df29d3bcb465d548f958
parentb5c079c88303a2d71969af3f5ee2d53eae79c595 (diff)
downloademacs-68456b5bd21cc15d095d0a3f23682903f065653b.tar.gz
(vc-diff): Turn off previous change.
-rw-r--r--lisp/vc.el3
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."
"There is no version-control master associated with this buffer"))
(let ((file buffer-file-name)
unchanged)
- (if (not (vc-locking-user file))
+ (if nil ;;; (not (vc-locking-user file))
+ ;; This seems like feeping creaturism -- rms.
;; if the file is not locked, ask for older version to compare with
(let ((old (read-string
"File is unchanged; version to compare with: ")))