diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-03-07 00:56:30 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-03-07 00:56:30 -0800 |
| commit | 7e319d3cc31d6735616e9f68c81042b4920e43e8 (patch) | |
| tree | 54643cde011c85dbf0de2239fe05980cb7d32e91 /lisp/vc/vc.el | |
| parent | 619f4b625e020c27d787e14e4f3c499be6b2ef77 (diff) | |
| download | emacs-7e319d3cc31d6735616e9f68c81042b4920e43e8.tar.gz | |
vc.el fix for bug#6146.
* lisp/vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt.
Give an explicit error if failed to make writable.
Diffstat (limited to 'lisp/vc/vc.el')
| -rw-r--r-- | lisp/vc/vc.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 2fb397ed6f8..7f55ffdbdad 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1117,7 +1117,10 @@ merge in the changes into your working copy." ;; Make the file+buffer read-write. (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file)) (error "Aborted")) - (set-file-modes file (logior (file-modes file) 128)) + ;; Maybe we somehow lost permissions on the directory. + (condition-case nil + (set-file-modes file (logior (file-modes file) 128)) + (error (error "Unable to make file writable"))) (let ((visited (get-file-buffer file))) (when visited (with-current-buffer visited |