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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3123c95ebae00243aeb0c2fd54d5a354259aadf..decb66eea09fec341b93c4300486556ce6829d96 100644 (file)
--- 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 4946f3eef7a79e4686f86fb87785a58847436ce0..24e020acf09d032a6f4ad3a572983f88a8ef8231 100644 (file)
--- 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)))