* subr.el (y-or-n-p): Remove leftover code from 2010-09-17T13:30:30Z!monnier@iro...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3dee5fb16be7e6508e33a95df3cb03c37b9088f4..c2b7c23ea1981036050aa06d7f1409d7beea465a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-09-20  Juanma Barranquero  <lekktu@gmail.com>
 
+       * subr.el (y-or-n-p): Remove leftover code from 2010-09-17T13:30:30Z!monnier@iro.umontreal.ca.
+
        * emacs-lisp/smie.el (smie-indent--hanging-p): Use `smie-indent--bolp'.
 
 2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>

diff --git a/lisp/subr.el b/lisp/subr.el
index e76a78cdda47eb1a720d52514699ee76109f5c48..b213ab759b23837be7fb1d9a89f7cdabc6fbcc95 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3403,10 +3403,7 @@ is nil and `use-dialog-box' is non-nil."
              ((memq answer '(exit-prefix quit)) (signal 'quit nil) t)
              (t t)))
         (ding)
-        (discard-input)
-        (setq xprompt
-              (if (eq answer 'recenter) prompt
-                (concat "Please answer y or n.  " prompt)))))
+        (discard-input)))
     (let ((ret (eq answer 'act)))
       (unless noninteractive
         (message "%s %s" prompt (if ret "y" "n")))