[Emacs-diffs] Changes to emacs/lisp/play/gamegrid.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/01/28 19:40:31

Index: gamegrid.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/play/gamegrid.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gamegrid.el 21 Jan 2007 03:05:07 -0000      1.25
+++ gamegrid.el 28 Jan 2007 19:40:31 -0000      1.26
@@ -420,7 +420,7 @@
   (if gamegrid-timer
       (if (featurep 'itimer)
           (delete-itimer gamegrid-timer)
-        (timer-set-time gamegrid-timer '(0 0 0) nil)))
+        (cancel-timer gamegrid-timer)))
   (setq gamegrid-timer nil))
 
 ;; ;;;;;;;;;;;;;;; high score functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -515,6 +515,8 @@
 (defun gamegrid-add-score-with-update-game-score-1 (file target score)
   (let ((default-directory "/")
        (errbuf (generate-new-buffer " *update-game-score loss*")))
+    ;; This can be called from a timer, so enable local quits.
+    (with-local-quit
     (apply
      'call-process
      (append
@@ -536,20 +538,19 @@
               user-mail-address)
              (t ""))
        ">  "
-       (current-time-string)))))
+         (current-time-string))))))
     (if (buffer-modified-p errbuf)
        (progn
          (display-buffer errbuf)
          (error "Failed to update game score file"))
       (kill-buffer errbuf))
-    (save-excursion
       (let ((buf (find-buffer-visiting target)))
        (if buf
            (progn
              (with-current-buffer buf
                (revert-buffer nil t nil))
              (display-buffer buf))
-         (find-file-read-only-other-window target))))))
+       (find-file-read-only-other-window target)))))
 
 (defun gamegrid-add-score-insecure (file score &optional directory)
   (save-excursion