diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2009-07-16 20:52:53 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2009-07-16 20:52:53 +0000 |
| commit | d56fdcd2490224ebad9805c09ecd18dfba75a62d (patch) | |
| tree | 5abfdaf0a055692e836540d064361e021538bb9e | |
| parent | 137987ab43d15cfafc0e11639d80f700408d5bea (diff) | |
| download | emacs-d56fdcd2490224ebad9805c09ecd18dfba75a62d.tar.gz emacs-d56fdcd2490224ebad9805c09ecd18dfba75a62d.tar.bz2 emacs-d56fdcd2490224ebad9805c09ecd18dfba75a62d.zip | |
* vc-rcs.el (vc-rcs-find-file-hook):
* vc-sccs.el (vc-sccs-find-file-hook): Fix cut and paste error.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-rcs.el | 4 | ||||
| -rw-r--r-- | lisp/vc-sccs.el | 4 |
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 @@ +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 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." ;; 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 --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." ;; 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))) ;;; |