* lisp/help.el (describe-bindings): Fix buffer handling.

(describe-bindings-internal): Mark obsolete.

Fixes: debbugs:17210

2 files changed, 18 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad6805f7685..3b5b7898933 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * help.el (describe-bindings): Fix buffer handling (bug#17210).
+        (describe-bindings-internal): Mark obsolete.
+
 2014-04-07  João Távora  <joaotavora@gmail.com>
 
         * elec-pair.el:
@@ -12,10 +17,9 @@
 
 2014-04-07  João Távora  <joaotavora@gmail.com>
 
-        * elec-pair.el (electric-pair-inhibit-if-helps-balance): Inhibit
-        quote pairing if point-max is inside an unterminated string.
-        (electric-pair--looking-at-unterminated-string-p):
-        Delete.
+        * elec-pair.el (electric-pair-inhibit-if-helps-balance):
+        Inhibit quote pairing if point-max is inside an unterminated string.
+        (electric-pair--looking-at-unterminated-string-p): Delete.
         (electric-pair--in-unterminated-string-p): New function.
 
 2014-04-07  Glenn Morris  <rgm@gnu.org>
@@ -35,13 +39,13 @@
 
 2014-04-06  João Távora  <joaotavora@gmail.com>
 
-        * progmodes/python.el (python-electric-pair-string-delimiter): Fix
-        triple-quoting electricity.  (Bug#17192)
+        * progmodes/python.el (python-electric-pair-string-delimiter):
+        Fix triple-quoting electricity.  (Bug#17192)
 
 2014-04-06  João Távora  <joaotavora@gmail.com>
 
-        * elec-pair.el (electric-pair-post-self-insert-function): Don't
-        skip whitespace when `electric-pair-text-pairs' and
+        * elec-pair.el (electric-pair-post-self-insert-function):
+        Don't skip whitespace when `electric-pair-text-pairs' and
         `electric-pair-pairs' were used. syntax to
         electric-pair--skip-whitespace.  (Bug#17183)
 
diff --git a/lisp/help.el b/lisp/help.el
index fdbf91f7dbd..72a95244716 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -485,8 +485,11 @@ or a buffer name."
   (or buffer (setq buffer (current-buffer)))
   (help-setup-xref (list #'describe-bindings prefix buffer)
                    (called-interactively-p 'interactive))
-  (with-current-buffer buffer
-    (describe-bindings-internal nil prefix)))
+  (with-help-window (help-buffer)
+    ;; Be aware that `describe-buffer-bindings' puts its output into
+    ;; the current buffer.
+    (with-current-buffer (help-buffer)
+      (describe-buffer-bindings buffer prefix))))
 
 ;; This function used to be in keymap.c.
 (defun describe-bindings-internal (&optional menus prefix)
@@ -497,6 +500,7 @@ The optional argument MENUS, if non-nil, says to mention menu bindings.
 \(Ordinarily these are omitted from the output.)
 The optional argument PREFIX, if non-nil, should be a key sequence;
 then we display only bindings that start with that prefix."
+  (declare (obsolete describe-buffer-bindings "24.4"))
   (let ((buf (current-buffer)))
     (with-help-window (help-buffer)
       ;; Be aware that `describe-buffer-bindings' puts its output into