diff options
| author | Romain Francoise | 2005-09-24 23:26:28 +0000 |
|---|---|---|
| committer | Romain Francoise | 2005-09-24 23:26:28 +0000 |
| commit | ce5a3ac01e1d22fe149978bd19bf7861ba116f62 (patch) | |
| tree | 9f407de17683e30922fe3e0e54bc90d65a0bb4ae /lisp/play | |
| parent | 668414769aa92a7350bacab3c98507c3c1189e5c (diff) | |
| download | emacs-ce5a3ac01e1d22fe149978bd19bf7861ba116f62.tar.gz emacs-ce5a3ac01e1d22fe149978bd19bf7861ba116f62.zip | |
2005-09-25 Romain Francoise <romain@orebokech.com>
* 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.el | 36 | ||||
| -rw-r--r-- | lisp/play/landmark.el | 26 | ||||
| -rw-r--r-- | lisp/play/mpuz.el | 6 |
3 files changed, 34 insertions, 34 deletions
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el index e9f7a07abe9..c7089ddd7f7 100644 --- a/lisp/play/gomoku.el +++ b/lisp/play/gomoku.el | |||
| @@ -671,11 +671,11 @@ that DVAL has been added on SQUARE." | |||
| 671 | (cond ((< gomoku-number-of-moves 20) | 671 | (cond ((< gomoku-number-of-moves 20) |
| 672 | "This was a REALLY QUICK win.") | 672 | "This was a REALLY QUICK win.") |
| 673 | (gomoku-human-refused-draw | 673 | (gomoku-human-refused-draw |
| 674 | "I won... Too bad you refused my offer of a draw !") | 674 | "I won... Too bad you refused my offer of a draw!") |
| 675 | (gomoku-human-took-back | 675 | (gomoku-human-took-back |
| 676 | "I won... Taking moves back will not help you !") | 676 | "I won... Taking moves back will not help you!") |
| 677 | ((not gomoku-emacs-played-first) | 677 | ((not gomoku-emacs-played-first) |
| 678 | "I won... Playing first did not help you much !") | 678 | "I won... Playing first did not help you much!") |
| 679 | ((and (zerop gomoku-number-of-human-wins) | 679 | ((and (zerop gomoku-number-of-human-wins) |
| 680 | (zerop gomoku-number-of-draws) | 680 | (zerop gomoku-number-of-draws) |
| 681 | (> gomoku-number-of-emacs-wins 1)) | 681 | (> gomoku-number-of-emacs-wins 1)) |
| @@ -688,7 +688,7 @@ that DVAL has been added on SQUARE." | |||
| 688 | (gomoku-human-took-back | 688 | (gomoku-human-took-back |
| 689 | " I, for one, never take my moves back...") | 689 | " I, for one, never take my moves back...") |
| 690 | (gomoku-emacs-played-first | 690 | (gomoku-emacs-played-first |
| 691 | ".. so what ?") | 691 | ".. so what?") |
| 692 | (" Now, let me play first just once.")))) | 692 | (" Now, let me play first just once.")))) |
| 693 | ((eq result 'human-resigned) | 693 | ((eq result 'human-resigned) |
| 694 | (setq gomoku-number-of-emacs-wins (1+ gomoku-number-of-emacs-wins)) | 694 | (setq gomoku-number-of-emacs-wins (1+ gomoku-number-of-emacs-wins)) |
| @@ -758,7 +758,7 @@ Use \\[describe-mode] for more info." | |||
| 758 | (setq gomoku-emacs-is-computing nil) | 758 | (setq gomoku-emacs-is-computing nil) |
| 759 | (gomoku-terminate-game 'crash-game) | 759 | (gomoku-terminate-game 'crash-game) |
| 760 | (sit-for 4) | 760 | (sit-for 4) |
| 761 | (or (y-or-n-p "Another game ") (error "Chicken !"))) | 761 | (or (y-or-n-p "Another game? ") (error "Chicken!"))) |
| 762 | (switch-to-buffer gomoku-buffer-name) | 762 | (switch-to-buffer gomoku-buffer-name) |
| 763 | (gomoku-mode)) | 763 | (gomoku-mode)) |
| 764 | (cond | 764 | (cond |
| @@ -779,14 +779,14 @@ Use \\[describe-mode] for more info." | |||
| 779 | (if (and (> m max-height) | 779 | (if (and (> m max-height) |
| 780 | (not (eq m gomoku-saved-board-height)) | 780 | (not (eq m gomoku-saved-board-height)) |
| 781 | ;; Use EQ because SAVED-BOARD-HEIGHT may be nil | 781 | ;; Use EQ because SAVED-BOARD-HEIGHT may be nil |
| 782 | (not (y-or-n-p (format "Do you really want %d rows " m)))) | 782 | (not (y-or-n-p (format "Do you really want %d rows? " m)))) |
| 783 | (setq m max-height))) | 783 | (setq m max-height))) |
| 784 | (message "One moment, please...") | 784 | (message "One moment, please...") |
| 785 | (gomoku-start-game n m) | 785 | (gomoku-start-game n m) |
| 786 | (if (y-or-n-p "Do you allow me to play first ") | 786 | (if (y-or-n-p "Do you allow me to play first? ") |
| 787 | (gomoku-emacs-plays) | 787 | (gomoku-emacs-plays) |
| 788 | (gomoku-prompt-for-move))) | 788 | (gomoku-prompt-for-move))) |
| 789 | ((y-or-n-p "Shall we continue our game ") | 789 | ((y-or-n-p "Shall we continue our game? ") |
| 790 | (gomoku-prompt-for-move)) | 790 | (gomoku-prompt-for-move)) |
| 791 | (t | 791 | (t |
| 792 | (gomoku-human-resigns)))) | 792 | (gomoku-human-resigns)))) |
| @@ -875,9 +875,9 @@ If the game is finished, this command requests for another game." | |||
| 875 | (let (square score) | 875 | (let (square score) |
| 876 | (setq square (gomoku-point-square)) | 876 | (setq square (gomoku-point-square)) |
| 877 | (cond ((null square) | 877 | (cond ((null square) |
| 878 | (error "Your point is not on a square. Retry !")) | 878 | (error "Your point is not on a square. Retry!")) |
| 879 | ((not (zerop (aref gomoku-board square))) | 879 | ((not (zerop (aref gomoku-board square))) |
| 880 | (error "Your point is not on a free square. Retry !")) | 880 | (error "Your point is not on a free square. Retry!")) |
| 881 | (t | 881 | (t |
| 882 | (setq score (aref gomoku-score-table square)) | 882 | (setq score (aref gomoku-score-table square)) |
| 883 | (gomoku-play-move square 1) | 883 | (gomoku-play-move square 1) |
| @@ -902,7 +902,7 @@ If the game is finished, this command requests for another game." | |||
| 902 | (sit-for 4) | 902 | (sit-for 4) |
| 903 | (gomoku-prompt-for-other-game)) | 903 | (gomoku-prompt-for-other-game)) |
| 904 | ((zerop gomoku-number-of-human-moves) | 904 | ((zerop gomoku-number-of-human-moves) |
| 905 | (message "You have not played yet... Your move ?")) | 905 | (message "You have not played yet... Your move?")) |
| 906 | (t | 906 | (t |
| 907 | (message "One moment, please...") | 907 | (message "One moment, please...") |
| 908 | ;; It is possible for the user to let Emacs play several consecutive | 908 | ;; 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." | |||
| 923 | (gomoku-crash-game)) | 923 | (gomoku-crash-game)) |
| 924 | ((not gomoku-game-in-progress) | 924 | ((not gomoku-game-in-progress) |
| 925 | (message "There is no game in progress")) | 925 | (message "There is no game in progress")) |
| 926 | ((y-or-n-p "You mean, you resign ") | 926 | ((y-or-n-p "You mean, you resign? ") |
| 927 | (gomoku-terminate-game 'human-resigned)) | 927 | (gomoku-terminate-game 'human-resigned)) |
| 928 | ((y-or-n-p "You mean, we continue ") | 928 | ((y-or-n-p "You mean, we continue? ") |
| 929 | (gomoku-prompt-for-move)) | 929 | (gomoku-prompt-for-move)) |
| 930 | (t | 930 | (t |
| 931 | (gomoku-terminate-game 'human-resigned)))) ; OK. Accept it | 931 | (gomoku-terminate-game 'human-resigned)))) ; OK. Accept it |
| @@ -937,21 +937,21 @@ If the game is finished, this command requests for another game." | |||
| 937 | (defun gomoku-prompt-for-move () | 937 | (defun gomoku-prompt-for-move () |
| 938 | "Display a message asking for Human's move." | 938 | "Display a message asking for Human's move." |
| 939 | (message (if (zerop gomoku-number-of-human-moves) | 939 | (message (if (zerop gomoku-number-of-human-moves) |
| 940 | "Your move ? (move to a free square and hit X, RET ...)" | 940 | "Your move? (move to a free square and hit X, RET ...)" |
| 941 | "Your move ?")) | 941 | "Your move?")) |
| 942 | ;; This may seem silly, but if one omits the following line (or a similar | 942 | ;; This may seem silly, but if one omits the following line (or a similar |
| 943 | ;; one), the cursor may very well go to some place where POINT is not. | 943 | ;; one), the cursor may very well go to some place where POINT is not. |
| 944 | (save-excursion (set-buffer (other-buffer)))) | 944 | (save-excursion (set-buffer (other-buffer)))) |
| 945 | 945 | ||
| 946 | (defun gomoku-prompt-for-other-game () | 946 | (defun gomoku-prompt-for-other-game () |
| 947 | "Ask for another game, and start it." | 947 | "Ask for another game, and start it." |
| 948 | (if (y-or-n-p "Another game ") | 948 | (if (y-or-n-p "Another game? ") |
| 949 | (gomoku gomoku-board-width gomoku-board-height) | 949 | (gomoku gomoku-board-width gomoku-board-height) |
| 950 | (error "Chicken !"))) | 950 | (error "Chicken!"))) |
| 951 | 951 | ||
| 952 | (defun gomoku-offer-a-draw () | 952 | (defun gomoku-offer-a-draw () |
| 953 | "Offer a draw and return t if Human accepted it." | 953 | "Offer a draw and return t if Human accepted it." |
| 954 | (or (y-or-n-p "I offer you a draw. Do you accept it ") | 954 | (or (y-or-n-p "I offer you a draw. Do you accept it? ") |
| 955 | (not (setq gomoku-human-refused-draw t)))) | 955 | (not (setq gomoku-human-refused-draw t)))) |
| 956 | 956 | ||
| 957 | ;;; | 957 | ;;; |
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el index 67c6c0d3021..48b614ea111 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." | |||
| 763 | (let (square score) | 763 | (let (square score) |
| 764 | (setq square (lm-point-square)) | 764 | (setq square (lm-point-square)) |
| 765 | (cond ((null square) | 765 | (cond ((null square) |
| 766 | (error "Your point is not on a square. Retry !")) | 766 | (error "Your point is not on a square. Retry!")) |
| 767 | ((not (zerop (aref lm-board square))) | 767 | ((not (zerop (aref lm-board square))) |
| 768 | (error "Your point is not on a free square. Retry !")) | 768 | (error "Your point is not on a free square. Retry!")) |
| 769 | (t | 769 | (t |
| 770 | (setq score (aref lm-score-table square)) | 770 | (setq score (aref lm-score-table square)) |
| 771 | (lm-play-move square 1) | 771 | (lm-play-move square 1) |
| @@ -790,7 +790,7 @@ If the game is finished, this command requests for another game." | |||
| 790 | (sit-for 4) | 790 | (sit-for 4) |
| 791 | (lm-prompt-for-other-game)) | 791 | (lm-prompt-for-other-game)) |
| 792 | ((zerop lm-number-of-human-moves) | 792 | ((zerop lm-number-of-human-moves) |
| 793 | (message "You have not played yet... Your move ?")) | 793 | (message "You have not played yet... Your move?")) |
| 794 | (t | 794 | (t |
| 795 | (message "One moment, please...") | 795 | (message "One moment, please...") |
| 796 | ;; It is possible for the user to let Emacs play several consecutive | 796 | ;; 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." | |||
| 811 | (lm-crash-game)) | 811 | (lm-crash-game)) |
| 812 | ((not lm-game-in-progress) | 812 | ((not lm-game-in-progress) |
| 813 | (message "There is no game in progress")) | 813 | (message "There is no game in progress")) |
| 814 | ((y-or-n-p "You mean, you resign ") | 814 | ((y-or-n-p "You mean, you resign? ") |
| 815 | (lm-terminate-game 'human-resigned)) | 815 | (lm-terminate-game 'human-resigned)) |
| 816 | ((y-or-n-p "You mean, we continue ") | 816 | ((y-or-n-p "You mean, we continue? ") |
| 817 | (lm-prompt-for-move)) | 817 | (lm-prompt-for-move)) |
| 818 | (t | 818 | (t |
| 819 | (lm-terminate-game 'human-resigned)))) ; OK. Accept it | 819 | (lm-terminate-game 'human-resigned)))) ; OK. Accept it |
| @@ -823,23 +823,23 @@ If the game is finished, this command requests for another game." | |||
| 823 | (defun lm-prompt-for-move () | 823 | (defun lm-prompt-for-move () |
| 824 | "Display a message asking for Human's move." | 824 | "Display a message asking for Human's move." |
| 825 | (message (if (zerop lm-number-of-human-moves) | 825 | (message (if (zerop lm-number-of-human-moves) |
| 826 | "Your move ? (move to a free square and hit X, RET ...)" | 826 | "Your move? (move to a free square and hit X, RET ...)" |
| 827 | "Your move ?")) | 827 | "Your move?")) |
| 828 | ;; This may seem silly, but if one omits the following line (or a similar | 828 | ;; This may seem silly, but if one omits the following line (or a similar |
| 829 | ;; one), the cursor may very well go to some place where POINT is not. | 829 | ;; one), the cursor may very well go to some place where POINT is not. |
| 830 | (save-excursion (set-buffer (other-buffer)))) | 830 | (save-excursion (set-buffer (other-buffer)))) |
| 831 | 831 | ||
| 832 | (defun lm-prompt-for-other-game () | 832 | (defun lm-prompt-for-other-game () |
| 833 | "Ask for another game, and start it." | 833 | "Ask for another game, and start it." |
| 834 | (if (y-or-n-p "Another game ") | 834 | (if (y-or-n-p "Another game? ") |
| 835 | (if (y-or-n-p "Retain learned weights ") | 835 | (if (y-or-n-p "Retain learned weights ") |
| 836 | (lm 2) | 836 | (lm 2) |
| 837 | (lm 1)) | 837 | (lm 1)) |
| 838 | (message "Chicken !"))) | 838 | (message "Chicken!"))) |
| 839 | 839 | ||
| 840 | (defun lm-offer-a-draw () | 840 | (defun lm-offer-a-draw () |
| 841 | "Offer a draw and return t if Human accepted it." | 841 | "Offer a draw and return t if Human accepted it." |
| 842 | (or (y-or-n-p "I offer you a draw. Do you accept it ") | 842 | (or (y-or-n-p "I offer you a draw. Do you accept it? ") |
| 843 | (not (setq lm-human-refused-draw t)))) | 843 | (not (setq lm-human-refused-draw t)))) |
| 844 | 844 | ||
| 845 | 845 | ||
| @@ -1523,9 +1523,9 @@ If the game is finished, this command requests for another game." | |||
| 1523 | (let (square score) | 1523 | (let (square score) |
| 1524 | (setq square (lm-point-square)) | 1524 | (setq square (lm-point-square)) |
| 1525 | (cond ((null square) | 1525 | (cond ((null square) |
| 1526 | (error "Your point is not on a square. Retry !")) | 1526 | (error "Your point is not on a square. Retry!")) |
| 1527 | ((not (zerop (aref lm-board square))) | 1527 | ((not (zerop (aref lm-board square))) |
| 1528 | (error "Your point is not on a free square. Retry !")) | 1528 | (error "Your point is not on a free square. Retry!")) |
| 1529 | (t | 1529 | (t |
| 1530 | (progn | 1530 | (progn |
| 1531 | (lm-plot-square square 1) | 1531 | (lm-plot-square square 1) |
| @@ -1678,7 +1678,7 @@ Use \\[describe-mode] for more info." | |||
| 1678 | (if (and (> lm-m max-height) | 1678 | (if (and (> lm-m max-height) |
| 1679 | (not (eq lm-m lm-saved-board-height)) | 1679 | (not (eq lm-m lm-saved-board-height)) |
| 1680 | ;; Use EQ because SAVED-BOARD-HEIGHT may be nil | 1680 | ;; Use EQ because SAVED-BOARD-HEIGHT may be nil |
| 1681 | (not (y-or-n-p (format "Do you really want %d rows " lm-m)))) | 1681 | (not (y-or-n-p (format "Do you really want %d rows? " lm-m)))) |
| 1682 | (setq lm-m max-height))) | 1682 | (setq lm-m max-height))) |
| 1683 | (if lm-one-moment-please | 1683 | (if lm-one-moment-please |
| 1684 | (message "One moment, please...")) | 1684 | (message "One moment, please...")) |
diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el index 948ae126ffa..6f2c9200928 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]." | |||
| 400 | (defun mpuz-offer-abort () | 400 | (defun mpuz-offer-abort () |
| 401 | "Ask if user wants to abort current puzzle." | 401 | "Ask if user wants to abort current puzzle." |
| 402 | (interactive) | 402 | (interactive) |
| 403 | (if (y-or-n-p "Abort game ") | 403 | (if (y-or-n-p "Abort game? ") |
| 404 | (let ((buf (mpuz-get-buffer))) | 404 | (let ((buf (mpuz-get-buffer))) |
| 405 | (message "Mult Puzzle aborted.") | 405 | (message "Mult Puzzle aborted.") |
| 406 | (setq mpuz-in-progress nil | 406 | (setq mpuz-in-progress nil |
| @@ -444,7 +444,7 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]." | |||
| 444 | (mpuz-ding t)) | 444 | (mpuz-ding t)) |
| 445 | (t | 445 | (t |
| 446 | (mpuz-try-proposal letter-char digit-char)))) | 446 | (mpuz-try-proposal letter-char digit-char)))) |
| 447 | (if (y-or-n-p "Start a new game ") | 447 | (if (y-or-n-p "Start a new game? ") |
| 448 | (mpuz-start-new-game) | 448 | (mpuz-start-new-game) |
| 449 | (message "OK. I won't.")))) | 449 | (message "OK. I won't.")))) |
| 450 | 450 | ||
| @@ -489,7 +489,7 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]." | |||
| 489 | (t "not serious."))))) | 489 | (t "not serious."))))) |
| 490 | (message message) | 490 | (message message) |
| 491 | (sit-for 4) | 491 | (sit-for 4) |
| 492 | (if (y-or-n-p (concat message " Start a new game ")) | 492 | (if (y-or-n-p (concat message " Start a new game? ")) |
| 493 | (mpuz-start-new-game) | 493 | (mpuz-start-new-game) |
| 494 | (message "Good Bye!")))) | 494 | (message "Good Bye!")))) |
| 495 | 495 | ||