# HG changeset patch # User Dan Nicolaescu # Date 1247777573 0 # Node ID b0f266cccf0b9ab8acd5dac00de543c47b2ab22b # Parent 7ffee8f51e96bce02bd310a92215c307cf53727f * vc-rcs.el (vc-rcs-find-file-hook): * vc-sccs.el (vc-sccs-find-file-hook): Fix cut and paste error. diff -r 7ffee8f51e96 -r b0f266cccf0b lisp/ChangeLog --- a/lisp/ChangeLog Thu Jul 16 19:37:08 2009 +0000 +++ b/lisp/ChangeLog Thu Jul 16 20:52:53 2009 +0000 @@ -1,3 +1,8 @@ +2009-07-16 Dan Nicolaescu + + * vc-rcs.el (vc-rcs-find-file-hook): + * vc-sccs.el (vc-sccs-find-file-hook): Fix cut and paste error. + 2009-07-16 Michael Albinus * net/tramp.el (tramp-wait-for-output): Handle the case when diff -r 7ffee8f51e96 -r b0f266cccf0b lisp/vc-rcs.el --- a/lisp/vc-rcs.el Thu Jul 16 19:37:08 2009 +0000 +++ b/lisp/vc-rcs.el Thu Jul 16 20:52:53 2009 +0000 @@ -824,8 +824,8 @@ ;; If the file is locked by some other user, make ;; the buffer read-only. Like this, even root ;; cannot modify a file that someone else has locked. - (stringp (vc-state buffer-file-name 'RCS)) - (setq buffer-read-only t)) + (and (stringp (vc-state buffer-file-name 'RCS)) + (setq buffer-read-only t))) ;;; diff -r 7ffee8f51e96 -r b0f266cccf0b lisp/vc-sccs.el --- a/lisp/vc-sccs.el Thu Jul 16 19:37:08 2009 +0000 +++ b/lisp/vc-sccs.el Thu Jul 16 20:52:53 2009 +0000 @@ -395,8 +395,8 @@ ;; If the file is locked by some other user, make ;; the buffer read-only. Like this, even root ;; cannot modify a file that someone else has locked. - (stringp (vc-state buffer-file-name 'SCCS)) - (setq buffer-read-only t)) + (and (stringp (vc-state buffer-file-name 'SCCS)) + (setq buffer-read-only t))) ;;;