[Emacs-diffs] /srv/bzr/emacs/trunk r103575: vc.el fix for bug#6146.

[Glenn Morris]

------------------------------------------------------------
revno: 103575
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2011-03-07 00:56:30 -0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/vc/vc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-07 08:39:43 +0000
+++ b/lisp/ChangeLog    2011-03-07 08:56:30 +0000
@@ -1,6 +1,7 @@
 2011-03-07  Glenn Morris  <address@hidden>
 
        * vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt.
+       Give an explicit error if failed to make writable.  (Bug#6146)
 
 2011-03-07  Ed Reingold  <address@hidden>
 

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2011-03-07 08:39:43 +0000
+++ b/lisp/vc/vc.el     2011-03-07 08:56:30 +0000
@@ -1117,7 +1117,10 @@
            ;; 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