[Emacs-diffs] /srv/bzr/emacs/trunk r105998: Fix argument to buffer-live-p in read-char-choice

[Leo Liu]

------------------------------------------------------------
revno: 105998
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Wed 2011-10-05 11:37:21 +0800
message:
  Fix argument to buffer-live-p in read-char-choice
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-05 00:56:26 +0000
+++ b/lisp/ChangeLog    2011-10-05 03:37:21 +0000
@@ -1,3 +1,8 @@
+2011-10-05  Leo Liu  <address@hidden>
+
+       * subr.el (read-char-choice): Fix argument to buffer-live-p which
+       works with buffer object.
+
 2011-10-05  Stefan Monnier  <address@hidden>
 
        * mpc.el (mpc-tool-bar-map): Add labels.

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2011-09-28 00:59:28 +0000
+++ b/lisp/subr.el      2011-10-05 03:37:21 +0000
@@ -2170,7 +2170,7 @@
            (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)))