diff options
| author | Tassilo Horn <tsdh@gnu.org> | 2019-09-22 11:02:39 +0200 |
|---|---|---|
| committer | Tassilo Horn <tsdh@gnu.org> | 2019-09-22 11:02:39 +0200 |
| commit | af0642a4cb220f33a43d1380be085bc0b7134bb8 (patch) | |
| tree | e3b1b57bc42e712c77bd55fc4fc722cf93fe6c66 /lisp/vc/vc-cvs.el | |
| parent | 8992bc7d1b7e7babbf2899b5c45e84b486f504e6 (diff) | |
| parent | 37a4233a366797360c2f4f475591a3406586bcfb (diff) | |
| download | emacs-scratch/tsdh-vc-list-files.tar.gz | |
Merge remote-tracking branch 'origin/master' into scratch/tsdh-vc-list-filesscratch/tsdh-vc-list-files
Diffstat (limited to 'lisp/vc/vc-cvs.el')
| -rw-r--r-- | lisp/vc/vc-cvs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index d84700fc176..a9e79d7956c 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -440,7 +440,7 @@ REV is the revision to check out." (if vc-cvs-use-edit (vc-cvs-command nil 0 file "unedit") ;; Make the file read-only by switching off all w-bits - (set-file-modes file (logand (file-modes file) 3950))))) + (set-file-modes file (logand (file-modes file) #o7555))))) (defun vc-cvs-merge-file (file) "Accept a file merge request, prompting for revisions." |