aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/play
diff options
context:
space:
mode:
authorRomain Francoise <[email protected]>2005-09-24 23:26:28 +0000
committerRomain Francoise <[email protected]>2005-09-24 23:26:28 +0000
commitce5a3ac01e1d22fe149978bd19bf7861ba116f62 (patch)
tree9f407de17683e30922fe3e0e54bc90d65a0bb4ae /lisp/play
parent668414769aa92a7350bacab3c98507c3c1189e5c (diff)
2005-09-25 Romain Francoise <[email protected]>
* dired-aux.el (dired-copy-file-recursive): * dired.el (dired-delete-file): * ediff-mult.el (ediff-dir-diff-copy-file): * ediff-util.el (ediff-test-save-region): * forms.el (forms-mode): * ido.el (ido-file-internal, ido-delete-file-at-head): * log-edit.el (log-edit-done): * ses.el (ses-yank-resize): * play/gomoku.el (gomoku-human-plays, gomoku) (gomoku-human-resigns, gomoku-prompt-for-other-game) (gomoku-offer-a-draw): * play/landmark.el (lm-human-resigns, lm): * net/eudcb-ldap.el (eudc-ldap-check-base): * play/mpuz.el (mpuz-offer-abort, mpuz-try-letter, mpuz-close-game): * progmodes/ebrowse.el (ebrowse-find-pattern): * progmodes/idlw-shell.el (idlwave-shell-set-bp-check): * textmodes/reftex-index.el (reftex-index-initialize-phrases-buffer): End `yes-or-no-p' and `y-or-n-p' prompts with question mark and space. * vc.el (vc-delete-file): * play/gomoku.el (gomoku-terminate-game, gomoku) (gomoku-prompt-for-move, gomoku-human-takes-back): * play/landmark.el (lm-human-takes-back, lm-prompt-for-move) (lm-start-robot, lm-human-plays): Remove extraneous spaces in messages.
Diffstat (limited to 'lisp/play')
-rw-r--r--lisp/play/gomoku.el36
-rw-r--r--lisp/play/landmark.el26
-rw-r--r--lisp/play/mpuz.el6
3 files changed, 34 insertions, 34 deletions
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index e9f7a07abe..c7089ddd7f 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -671,11 +671,11 @@ that DVAL has been added on SQUARE."
(cond ((< gomoku-number-of-moves 20)
"This was a REALLY QUICK win.")
(gomoku-human-refused-draw
- "I won... Too bad you refused my offer of a draw !")
+ "I won... Too bad you refused my offer of a draw!")
(gomoku-human-took-back
- "I won... Taking moves back will not help you !")
+ "I won... Taking moves back will not help you!")
((not gomoku-emacs-played-first)
- "I won... Playing first did not help you much !")
+ "I won... Playing first did not help you much!")
((and (zerop gomoku-number-of-human-wins)
(zerop gomoku-number-of-draws)
(> gomoku-number-of-emacs-wins 1))
@@ -688,7 +688,7 @@ that DVAL has been added on SQUARE."
(gomoku-human-took-back
" I, for one, never take my moves back...")
(gomoku-emacs-played-first
- ".. so what ?")
+ ".. so what?")
(" Now, let me play first just once."))))
((eq result 'human-resigned)
(setq gomoku-number-of-emacs-wins (1+ gomoku-number-of-emacs-wins))
@@ -758,7 +758,7 @@ Use \\[describe-mode] for more info."
(setq gomoku-emacs-is-computing nil)
(gomoku-terminate-game 'crash-game)
(sit-for 4)
- (or (y-or-n-p "Another game ") (error "Chicken !")))
+ (or (y-or-n-p "Another game? ") (error "Chicken!")))
(switch-to-buffer gomoku-buffer-name)
(gomoku-mode))
(cond
@@ -779,14 +779,14 @@ Use \\[describe-mode] for more info."
(if (and (> m max-height)
(not (eq m gomoku-saved-board-height))
;; Use EQ because SAVED-BOARD-HEIGHT may be nil
- (not (y-or-n-p (format "Do you really want %d rows " m))))
+ (not (y-or-n-p (format "Do you really want %d rows? " m))))
(setq m max-height)))
(message "One moment, please...")
(gomoku-start-game n m)
- (if (y-or-n-p "Do you allow me to play first ")
+ (if (y-or-n-p "Do you allow me to play first? ")
(gomoku-emacs-plays)
(gomoku-prompt-for-move)))
- ((y-or-n-p "Shall we continue our game ")
+ ((y-or-n-p "Shall we continue our game? ")
(gomoku-prompt-for-move))
(t
(gomoku-human-resigns))))
@@ -875,9 +875,9 @@ If the game is finished, this command requests for another game."
(let (square score)
(setq square (gomoku-point-square))
(cond ((null square)
- (error "Your point is not on a square. Retry !"))
+ (error "Your point is not on a square. Retry!"))
((not (zerop (aref gomoku-board square)))
- (error "Your point is not on a free square. Retry !"))
+ (error "Your point is not on a free square. Retry!"))
(t
(setq score (aref gomoku-score-table square))
(gomoku-play-move square 1)
@@ -902,7 +902,7 @@ If the game is finished, this command requests for another game."
(sit-for 4)
(gomoku-prompt-for-other-game))
((zerop gomoku-number-of-human-moves)
- (message "You have not played yet... Your move ?"))
+ (message "You have not played yet... Your move?"))
(t
(message "One moment, please...")
;; It is possible for the user to let Emacs play several consecutive
@@ -923,9 +923,9 @@ If the game is finished, this command requests for another game."
(gomoku-crash-game))
((not gomoku-game-in-progress)
(message "There is no game in progress"))
- ((y-or-n-p "You mean, you resign ")
+ ((y-or-n-p "You mean, you resign? ")
(gomoku-terminate-game 'human-resigned))
- ((y-or-n-p "You mean, we continue ")
+ ((y-or-n-p "You mean, we continue? ")
(gomoku-prompt-for-move))
(t
(gomoku-terminate-game 'human-resigned)))) ; OK. Accept it
@@ -937,21 +937,21 @@ If the game is finished, this command requests for another game."
(defun gomoku-prompt-for-move ()
"Display a message asking for Human's move."
(message (if (zerop gomoku-number-of-human-moves)
- "Your move ? (move to a free square and hit X, RET ...)"
- "Your move ?"))
+ "Your move? (move to a free square and hit X, RET ...)"
+ "Your move?"))
;; This may seem silly, but if one omits the following line (or a similar
;; one), the cursor may very well go to some place where POINT is not.
(save-excursion (set-buffer (other-buffer))))
(defun gomoku-prompt-for-other-game ()
"Ask for another game, and start it."
- (if (y-or-n-p "Another game ")
+ (if (y-or-n-p "Another game? ")
(gomoku gomoku-board-width gomoku-board-height)
- (error "Chicken !")))
+ (error "Chicken!")))
(defun gomoku-offer-a-draw ()
"Offer a draw and return t if Human accepted it."
- (or (y-or-n-p "I offer you a draw. Do you accept it ")
+ (or (y-or-n-p "I offer you a draw. Do you accept it? ")
(not (setq gomoku-human-refused-draw t))))
;;;
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index 67c6c0d302..48b614ea11 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -763,9 +763,9 @@ If the game is finished, this command requests for another game."
(let (square score)
(setq square (lm-point-square))
(cond ((null square)
- (error "Your point is not on a square. Retry !"))
+ (error "Your point is not on a square. Retry!"))
((not (zerop (aref lm-board square)))
- (error "Your point is not on a free square. Retry !"))
+ (error "Your point is not on a free square. Retry!"))
(t
(setq score (aref lm-score-table square))
(lm-play-move square 1)
@@ -790,7 +790,7 @@ If the game is finished, this command requests for another game."
(sit-for 4)
(lm-prompt-for-other-game))
((zerop lm-number-of-human-moves)
- (message "You have not played yet... Your move ?"))
+ (message "You have not played yet... Your move?"))
(t
(message "One moment, please...")
;; It is possible for the user to let Emacs play several consecutive
@@ -811,9 +811,9 @@ If the game is finished, this command requests for another game."
(lm-crash-game))
((not lm-game-in-progress)
(message "There is no game in progress"))
- ((y-or-n-p "You mean, you resign ")
+ ((y-or-n-p "You mean, you resign? ")
(lm-terminate-game 'human-resigned))
- ((y-or-n-p "You mean, we continue ")
+ ((y-or-n-p "You mean, we continue? ")
(lm-prompt-for-move))
(t
(lm-terminate-game 'human-resigned)))) ; OK. Accept it
@@ -823,23 +823,23 @@ If the game is finished, this command requests for another game."
(defun lm-prompt-for-move ()
"Display a message asking for Human's move."
(message (if (zerop lm-number-of-human-moves)
- "Your move ? (move to a free square and hit X, RET ...)"
- "Your move ?"))
+ "Your move? (move to a free square and hit X, RET ...)"
+ "Your move?"))
;; This may seem silly, but if one omits the following line (or a similar
;; one), the cursor may very well go to some place where POINT is not.
(save-excursion (set-buffer (other-buffer))))
(defun lm-prompt-for-other-game ()
"Ask for another game, and start it."
- (if (y-or-n-p "Another game ")
+ (if (y-or-n-p "Another game? ")
(if (y-or-n-p "Retain learned weights ")
(lm 2)
(lm 1))
- (message "Chicken !")))
+ (message "Chicken!")))
(defun lm-offer-a-draw ()
"Offer a draw and return t if Human accepted it."
- (or (y-or-n-p "I offer you a draw. Do you accept it ")
+ (or (y-or-n-p "I offer you a draw. Do you accept it? ")
(not (setq lm-human-refused-draw t))))
@@ -1523,9 +1523,9 @@ If the game is finished, this command requests for another game."
(let (square score)
(setq square (lm-point-square))
(cond ((null square)
- (error "Your point is not on a square. Retry !"))
+ (error "Your point is not on a square. Retry!"))
((not (zerop (aref lm-board square)))
- (error "Your point is not on a free square. Retry !"))
+ (error "Your point is not on a free square. Retry!"))
(t
(progn
(lm-plot-square square 1)
@@ -1678,7 +1678,7 @@ Use \\[describe-mode] for more info."
(if (and (> lm-m max-height)
(not (eq lm-m lm-saved-board-height))
;; Use EQ because SAVED-BOARD-HEIGHT may be nil
- (not (y-or-n-p (format "Do you really want %d rows " lm-m))))
+ (not (y-or-n-p (format "Do you really want %d rows? " lm-m))))
(setq lm-m max-height)))
(if lm-one-moment-please
(message "One moment, please..."))
diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el
index 948ae126ff..6f2c920092 100644
--- a/lisp/play/mpuz.el
+++ b/lisp/play/mpuz.el
@@ -400,7 +400,7 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
(defun mpuz-offer-abort ()
"Ask if user wants to abort current puzzle."
(interactive)
- (if (y-or-n-p "Abort game ")
+ (if (y-or-n-p "Abort game? ")
(let ((buf (mpuz-get-buffer)))
(message "Mult Puzzle aborted.")
(setq mpuz-in-progress nil
@@ -444,7 +444,7 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
(mpuz-ding t))
(t
(mpuz-try-proposal letter-char digit-char))))
- (if (y-or-n-p "Start a new game ")
+ (if (y-or-n-p "Start a new game? ")
(mpuz-start-new-game)
(message "OK. I won't."))))
@@ -489,7 +489,7 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
(t "not serious.")))))
(message message)
(sit-for 4)
- (if (y-or-n-p (concat message " Start a new game "))
+ (if (y-or-n-p (concat message " Start a new game? "))
(mpuz-start-new-game)
(message "Good Bye!"))))