Fix argument to buffer-live-p in read-char-choice

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3123c95eba..decb66eea09 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-05  Leo Liu  <sdl.web@gmail.com>
+
+        * subr.el (read-char-choice): Fix argument to buffer-live-p which
+        works with buffer object.
+
 2011-10-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * mpc.el (mpc-tool-bar-map): Add labels.
diff --git a/lisp/subr.el b/lisp/subr.el
index 4946f3eef7a..24e020acf09 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2170,7 +2170,7 @@ keyboard-quit events while waiting for a valid input."
             (setq prompt (propertize prompt 'face 'minibuffer-prompt)))
           (setq char (let ((inhibit-quit inhibit-keyboard-quit))
                        (read-key prompt)))
-          (and show-help (buffer-live-p helpbuf)
+          (and show-help (buffer-live-p (get-buffer helpbuf))
                (kill-buffer helpbuf))
           (cond
            ((not (numberp char)))