3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index f2abc00e3f5..609585c9522 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -948,13 +948,13 @@ If the game is finished, this command requests for another game."
 
 (defun gomoku-max-width ()
   "Largest possible board width for the current window."
-  (1+ (/ (- (window-width (selected-window))
+  (1+ (/ (- (window-width)
 	    gomoku-x-offset gomoku-x-offset 1)
 	 gomoku-square-width)))
 
 (defun gomoku-max-height ()
   "Largest possible board height for the current window."
-  (1+ (/ (- (window-height (selected-window))
+  (1+ (/ (- (window-height)
 	    gomoku-y-offset gomoku-y-offset 2)
 	 ;; 2 instead of 1 because WINDOW-HEIGHT includes the mode line !
 	 gomoku-square-height)))
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index 0845ea2c300..cf86d7a9de5 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -843,13 +843,13 @@ If the game is finished, this command requests for another game."
 
 (defun landmark-max-width ()
   "Largest possible board width for the current window."
-  (1+ (/ (- (window-width (selected-window))
+  (1+ (/ (- (window-width)
 	    landmark-x-offset landmark-x-offset 1)
 	 landmark-square-width)))
 
 (defun landmark-max-height ()
   "Largest possible board height for the current window."
-  (1+ (/ (- (window-height (selected-window))
+  (1+ (/ (- (window-height)
 	    landmark-y-offset landmark-y-offset 2)
 	 ;; 2 instead of 1 because WINDOW-HEIGHT includes the mode line !
 	 landmark-square-height)))
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index 1724ebdf198..0f333392b9a 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -110,7 +110,7 @@ If the element is a function or a list of a function and a number,
     (let ((f (selected-frame))
           (outbuf (get-buffer-create "*zone*"))
           (text (buffer-substring (window-start) (window-end)))
-          (wp (1+ (- (window-point (selected-window))
+          (wp (1+ (- (window-point)
                      (window-start)))))
       (put 'zone 'orig-buffer (current-buffer))
       (switch-to-buffer outbuf)