aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc-rcs.el4
-rw-r--r--lisp/vc-sccs.el4
3 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3591f99e49..fc87eecda2a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-07-16 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc-rcs.el (vc-rcs-find-file-hook):
4 * vc-sccs.el (vc-sccs-find-file-hook): Fix cut and paste error.
5
12009-07-16 Michael Albinus <michael.albinus@gmx.de> 62009-07-16 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-wait-for-output): Handle the case when 8 * net/tramp.el (tramp-wait-for-output): Handle the case when
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index ec30ca4576c..8e6eb62ae75 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -824,8 +824,8 @@ systime, or nil if there is none. Also, reposition point."
824 ;; If the file is locked by some other user, make 824 ;; If the file is locked by some other user, make
825 ;; the buffer read-only. Like this, even root 825 ;; the buffer read-only. Like this, even root
826 ;; cannot modify a file that someone else has locked. 826 ;; cannot modify a file that someone else has locked.
827 (stringp (vc-state buffer-file-name 'RCS)) 827 (and (stringp (vc-state buffer-file-name 'RCS))
828 (setq buffer-read-only t)) 828 (setq buffer-read-only t)))
829 829
830 830
831;;; 831;;;
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index 6e9c2dd3fc6..9236f604f80 100644
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -395,8 +395,8 @@ revert all subfiles."
395 ;; If the file is locked by some other user, make 395 ;; If the file is locked by some other user, make
396 ;; the buffer read-only. Like this, even root 396 ;; the buffer read-only. Like this, even root
397 ;; cannot modify a file that someone else has locked. 397 ;; cannot modify a file that someone else has locked.
398 (stringp (vc-state buffer-file-name 'SCCS)) 398 (and (stringp (vc-state buffer-file-name 'SCCS))
399 (setq buffer-read-only t)) 399 (setq buffer-read-only t)))
400 400
401 401
402;;; 402;;;