*** empty log message ***

[bpt/emacs.git] / src / fns.c

diff --git a/src/fns.c b/src/fns.c
index b30a242..d39e59a 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -28,10 +28,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "lisp.h"
 #include "commands.h"
 
-#ifdef MULTI_SCREEN
-#include "screen.h"
-#endif
-
 #include "buffer.h"
 
 Lisp_Object Qstring_lessp;
@@ -1082,6 +1078,8 @@ SEQUENCE may be a list, a vector or a string.")
 
 DEFUN ("y-or-n-p", Fy_or_n_p, Sy_or_n_p, 1, 1, 0,
   "Ask user a \"y or n\" question.  Return t if answer is \"y\".\n\
+Takes one argument, which is the string to display to ask the question.\n\
+It should end in a space; `y-or-n-p' adds `(y or n) ' to it.\n\
 No confirmation of the answer is requested; a single character is enough.\n\
 Also accepts Space to mean yes, or Delete to mean no.")
   (prompt)
@@ -1151,9 +1149,11 @@ do_yes_or_no_p (prompt)
 /* Anything that calls this function must protect from GC!  */
 
 DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1, 1, 0,
-  "Ask user a yes or no question.  Return t if answer is yes.\n\
-The user must confirm the answer with a newline,\n\
-and can rub it out if not confirmed.")
+  "Ask user a yes-or-no question.  Return t if answer is yes.\n\
+Takes one argument, which is the string to display to ask the question.\n\
+It should end in a space; `yes-or-no-p' adds `(yes or no) ' to it.\n\
+The user must confirm the answer with RET,\n\
+and can edit it until it as been confirmed.")
   (prompt)
      Lisp_Object prompt;
 {
@@ -1170,8 +1170,7 @@ and can rub it out if not confirmed.")
   GCPRO1 (prompt);
   while (1)
     {
-      ans = Fdowncase (read_minibuf (Vminibuffer_local_map,
-                                    Qnil, prompt, Qnil, 0));
+      ans = Fdowncase (Fread_string (prompt, Qnil));
       if (XSTRING (ans)->size == 3 && !strcmp (XSTRING (ans)->data, "yes"))
        {
          UNGCPRO;