# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1284943937 -7200
# Node ID ec099872cdc46a8e286564b43ff02c9c5bdb7380
# Parent  33cf78a271ef0ef057a0edbe2c318c483d5ee97e
* subr.el (y-or-n-p): Remove leftover code from revno 101459.

diff -r 33cf78a271ef -r ec099872cdc4 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Sep 20 00:36:54 2010 +0000
+++ b/lisp/ChangeLog	Mon Sep 20 02:52:17 2010 +0200
@@ -1,5 +1,7 @@
 2010-09-20  Juanma Barranquero  <lekktu@gmail.com>
 
+	* subr.el (y-or-n-p): Remove leftover code from revno 101459.
+
 	* emacs-lisp/smie.el (smie-indent--hanging-p): Use `smie-indent--bolp'.
 
 2010-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
diff -r 33cf78a271ef -r ec099872cdc4 lisp/subr.el
--- a/lisp/subr.el	Mon Sep 20 00:36:54 2010 +0000
+++ b/lisp/subr.el	Mon Sep 20 02:52:17 2010 +0200
@@ -3403,10 +3403,7 @@
              ((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")))