Mercurial > emacs
changeset 103937:b0f266cccf0b
* vc-rcs.el (vc-rcs-find-file-hook):
* vc-sccs.el (vc-sccs-find-file-hook): Fix cut and paste error.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 16 Jul 2009 20:52:53 +0000 |
| parents | 7ffee8f51e96 |
| children | b6678898a7da |
| files | lisp/ChangeLog lisp/vc-rcs.el lisp/vc-sccs.el |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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 <dann@ics.uci.edu> + + * 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 <michael.albinus@gmx.de> * net/tramp.el (tramp-wait-for-output): Handle the case when
--- 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))) ;;;
--- 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))) ;;;