17 files changed, 78 insertions, 49 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54b224c232d..60d1609481f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,36 @@
+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.
+
 2005-09-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * term/rxvt.el (rxvt-register-default-colors): Add support for 255
-        color rxvt terminals by using the code xterm.el used to use before 
+        color rxvt terminals by using the code xterm.el used to use before
         2005-04-09 in order to match the colors used by rxvt.
 
 2005-09-24  Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 561c7cc7f6f..f946199bbd6 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1147,7 +1147,7 @@ Special value `always' suppresses confirmation."
     (if (and recursive
              (eq t (car attrs))
              (or (eq recursive 'always)
-                 (yes-or-no-p (format "Recursive copies of %s " from))))
+                 (yes-or-no-p (format "Recursive copies of %s? " from))))
         ;; This is a directory.
         (let ((files (directory-files from nil dired-re-no-dot)))
           (if (eq recursive 'top) (setq recursive 'always)) ; Don't ask any more.
diff --git a/lisp/dired.el b/lisp/dired.el
index e06e808e1ae..3934fe4e433 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2379,7 +2379,7 @@ Anything else, ask for each sub-directory."
                (setq files
                      (directory-files file t dired-re-no-dot)) ; Not empty.
                (or (eq recursive 'always)
-                   (yes-or-no-p (format "Recursive delete of %s "
+                   (yes-or-no-p (format "Recursive delete of %s? "
                                         (dired-make-relative file)))))
         (if (eq recursive 'top) (setq recursive 'always)) ; Don't ask again.
         (while files            ; Recursively delete (possibly asking).
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 2c192c133e2..436c1817edf 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1314,7 +1314,7 @@ Useful commands:
          (if otherfile
              (or (file-exists-p otherfile)
                  (if (y-or-n-p
-                      (format "Copy %s to %s ? " file-abs otherfile))
+                      (format "Copy %s to %s? " file-abs otherfile))
                      (let* ((file-diff-record (assoc file-tail dir-diff-list))
                             (new-mem-code
                              (* (cdr file-diff-record) file-mem-code)))
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 20a9869ac47..9ab24ce5f64 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -2111,7 +2111,7 @@ ARG is a prefix argument.  If nil, copy the current difference region."
     (if this-buf-n-th-diff-saved
         (if (yes-or-no-p
              (format
-              "You've previously copied diff region %d to buffer %S.  Confirm "
+              "You've previously copied diff region %d to buffer %S.  Confirm? "
               (1+ n) buf-type))
             t
           (error "Quit"))
diff --git a/lisp/forms.el b/lisp/forms.el
index 419a6fa3778..e7282ee0ea5 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -519,7 +519,7 @@ Commands:                        Equivalent keys in read-only mode:
         (if (or (eq enable-local-eval t)
                 (yes-or-no-p
                  (concat "Evaluate lisp code in buffer "
-                         (buffer-name) " to display forms ")))
+                         (buffer-name) " to display forms? ")))
             (eval-buffer)
           (error "`enable-local-eval' inhibits buffer evaluation"))
 
diff --git a/lisp/ido.el b/lisp/ido.el
index 7c9d269417a..2d62f6c74ef 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2138,7 +2138,7 @@ If INITIAL is non-nil, it specifies the initial input string."
               (ido-record-command method dirname)
               (ido-record-work-directory)
               (funcall method dirname))
-             ((y-or-n-p (format "Directory %s does not exist. Create it " filename))
+             ((y-or-n-p (format "Directory %s does not exist. Create it? " filename))
               (ido-record-command method dirname)
               (ido-record-work-directory dirname)
               (make-directory-internal dirname)
@@ -3529,7 +3529,7 @@ for first matching file."
                (file-exists-p file)
                (not (file-directory-p file))
                (file-writable-p ido-current-directory)
-               (yes-or-no-p (concat "Delete " file " ")))
+               (yes-or-no-p (concat "Delete " file "? ")))
       (delete-file file)
       ;; Check if file still exists.
       (if (file-exists-p file)
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 4e179ef8bad..54249eb52e3 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -383,7 +383,7 @@ If you want to abort the commit, simply delete the buffer."
                        (equal (log-edit-files) log-edit-initial-files)))
              (progn
                (log-edit-show-files)
-               (not (y-or-n-p "Really commit ? "))))
+               (not (y-or-n-p "Really commit? "))))
         (progn (when (not win) (log-edit-hide-buf))
                (message "Oh, well!  Later maybe?"))
       (run-hooks 'log-edit-done-hook)
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index e28a044ba55..93f7c24d077 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -194,7 +194,7 @@ attribute names are returned. Default to `person'"
   "Check if the current LDAP server has a configured search base."
   (unless (or (eudc-ldap-get-host-parameter eudc-server 'base)
               ldap-default-base
-              (null (y-or-n-p "No search base defined. Configure it now ?")))
+              (null (y-or-n-p "No search base defined. Configure it now? ")))
     ;; If the server is not in ldap-host-parameters-alist we add it for the
     ;; user
     (if (null (assoc eudc-server ldap-host-parameters-alist))
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."
      (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 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."
     (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 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]."
 (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!"))))
 
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 49d0207882c..47e9a12f235 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1798,7 +1798,7 @@ INFO is a list (TREE-HEADER TREE-OR-MEMBER MEMBER-LIST)."
       ;; START will be 0.
       (when (and (boundp 'ebrowse-debug)
                  (symbol-value 'ebrowse-debug))
-        (y-or-n-p (format "start = %d" start))
+        (y-or-n-p (format "start = %d? " start))
         (y-or-n-p pattern))
       (setf found
             (loop do (goto-char (max (point-min) (- start offset)))
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 7dc12226722..4b646a72f3b 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -2462,7 +2462,7 @@ the problem with not being able to set the breakpoint."
               (beep)
               (y-or-n-p 
                (concat "Okay to recompile file "
-                       (idlwave-shell-bp-get bp 'file) " ")))
+                       (idlwave-shell-bp-get bp 'file) "? ")))
             ;; Recompile
             (progn
               ;; Clean up before retrying
diff --git a/lisp/ses.el b/lisp/ses.el
index 75562edddb9..4c959c015a7 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -2560,7 +2560,7 @@ spot, or error signal if user requests cancel."
           colbool  (> needcols 0))
     (when (or rowbool colbool)
       ;;Need to insert.  Get confirm
-      (or (y-or-n-p (format "Yank will insert %s%s%s.  Continue "
+      (or (y-or-n-p (format "Yank will insert %s%s%s.  Continue? "
                             (if rowbool (format "%d rows" needrows) "")
                             (if (and rowbool colbool) " and " "")
                             (if colbool (format "%d columns" needcols) "")))
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index c987ed830b8..65025645c0d 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1239,7 +1239,7 @@ If the buffer is non-empty, delete the old header first."
           (beginning-of-line 2))          
       (cond ((fboundp 'zmacs-activate-region) (zmacs-activate-region))
             ((boundp 'make-active) (setq mark-active t)))
-      (if (yes-or-no-p "Delete and rebuilt header ")
+      (if (yes-or-no-p "Delete and rebuild header? ")
           (delete-region (point-min) (point))))
 
     ;; Insert the mode line
diff --git a/lisp/vc.el b/lisp/vc.el
index a1b446ab368..f7afbedc354 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2727,7 +2727,7 @@ backend to NEW-BACKEND, and unregister FILE from the current backend.
       (error "Deleting files under %s is not supported in VC" backend))
     (if (and buf (buffer-modified-p buf))
         (error "Please save files before deleting them"))
-    (unless (y-or-n-p (format "Really want to delete %s ? "
+    (unless (y-or-n-p (format "Really want to delete %s? "
                               (file-name-nondirectory file)))
       (error "Abort!"))
     (unless (or (file-directory-p file) (null make-backup-files))