[Emacs-diffs] /srv/bzr/emacs/trunk r111676: gamegrid-add-score-with-update-game-score fix

[Glenn Morris]

------------------------------------------------------------
revno: 111676
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-02-04 21:03:51 -0500
message:
  gamegrid-add-score-with-update-game-score fix
  
  * lisp/play/gamegrid.el (gamegrid-add-score-with-update-game-score):
  Fix directory creation in fallback case.
modified:
  lisp/ChangeLog
  lisp/play/gamegrid.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-04 21:23:15 +0000
+++ b/lisp/ChangeLog    2013-02-05 02:03:51 +0000
@@ -1,3 +1,8 @@
+2013-02-05  Glenn Morris  <address@hidden>
+
+       * play/gamegrid.el (gamegrid-add-score-with-update-game-score):
+       Fix directory creation in fallback case.
+
 2013-02-04  Thierry Volpiatto  <address@hidden>
 
        * vc/vc.el (vc-next-action): Fix inf-loop (bug#13610).

=== modified file 'lisp/play/gamegrid.el'
--- a/lisp/play/gamegrid.el     2013-01-02 16:13:04 +0000
+++ b/lisp/play/gamegrid.el     2013-02-05 02:03:51 +0000
@@ -505,15 +505,13 @@
             (make-directory gamegrid-user-score-file-directory t))
           (gamegrid-add-score-insecure file score
                                        gamegrid-user-score-file-directory))
-         (t (let ((f (expand-file-name
-                      gamegrid-user-score-file-directory)))
-              (when (file-writable-p f)
-                (unless (eq (car-safe (file-attributes f))
-                            t)
-                  (make-directory f))
-                (setq f (expand-file-name file f))
+         (t
+          (unless (file-exists-p
+                   (directory-file-name gamegrid-user-score-file-directory))
+            (make-directory gamegrid-user-score-file-directory t))
+          (let ((f (expand-file-name file gamegrid-user-score-file-directory)))
                 (unless (file-exists-p f)
-                  (write-region "" nil f nil 'silent nil 'excl)))
+              (write-region "" nil f nil 'silent nil 'excl))
               (gamegrid-add-score-with-update-game-score-1 file f score))))))
 
 (defun gamegrid-add-score-with-update-game-score-1 (file target score)