3 files changed, 6 insertions, 55 deletions

diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index faa323f733a..cb77148c285 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -816,60 +816,6 @@ Redefining FUNCTION also cancels it."
               '((depth . -100)))
   function)
 
-;;;###autoload
-;; (defun debug-on-set (symbol)
-;;   "Request FUNCTION to invoke debugger each time it is called.
-
-;; When called interactively, prompt for FUNCTION in the minibuffer.
-
-;; This works by modifying the definition of FUNCTION.  If you tell the
-;; debugger to continue, FUNCTION's execution proceeds.  If FUNCTION is a
-;; normal function or a macro written in Lisp, you can also step through
-;; its execution.  FUNCTION can also be a primitive that is not a special
-;; form, in which case stepping is not possible.  Break-on-entry for
-;; primitive functions only works when that function is called from Lisp.
-
-;; Use \\[cancel-debug-on-entry] to cancel the effect of this command.
-;; Redefining FUNCTION also cancels it."
-;;   (interactive
-;;    (let ((v (variable-at-point))
-;;       (enable-recursive-minibuffers t)
-;;          (orig-buffer (current-buffer))
-;;       val)
-;;      (setq val (completing-read
-;;                 (if (symbolp v)
-;;                     (format
-;;                      "Debug on set to symbol (default %s): " v)
-;;                   "Debug on set to symbol: ")
-;;                 #'help--symbol-completion-table
-;;                 (lambda (vv)
-;;                   ;; In case the variable only exists in the buffer
-;;                   ;; the command we switch back to that buffer before
-;;                   ;; we examine the variable.
-;;                   (with-current-buffer orig-buffer
-;;                     (or (get vv 'variable-documentation)
-;;                         (and (boundp vv) (not (keywordp vv))))))
-;;                 t nil nil
-;;                 (if (symbolp v) (symbol-name v))))
-;;      (list (if (equal val "")
-;;             v (intern val)))))
-
-
-
-;;   (interactive
-;;    (let* ((var-default (variable-at-point))
-;;           (var (completing-read
-;;              (if var-default
-;;                  (format "Debug on set to symbol (default %s): " var-default)
-;;                "Debug on set to symbol: ")
-;;              nil
-;;              #'boundp
-;;              t nil nil (symbol-name var-default))))
-;;      (list (if (equal var "") var-default (intern var)))))
-;;   (advice-add function :before #'debug--implement-debug-on-entry
-;;               '((depth . -100)))
-;;   function)
-
 (defun debug--function-list ()
   "List of functions currently set for debug on entry."
   (let ((funs '()))
diff --git a/lisp/emacs-lisp/let-alist.el b/lisp/emacs-lisp/let-alist.el
index a45fc0a05c3..cf82fe3ec63 100644
--- a/lisp/emacs-lisp/let-alist.el
+++ b/lisp/emacs-lisp/let-alist.el
@@ -4,7 +4,7 @@
 
 ;; Author: Artur Malabarba <emacs@endlessparentheses.com>
 ;; Package-Requires: ((emacs "24.1"))
-;; Version: 1.0.4
+;; Version: 1.0.5
 ;; Keywords: extensions lisp
 ;; Prefix: let-alist
 ;; Separator: -
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 7736225b5fa..52331b9ad36 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -214,6 +214,11 @@ user enters `recenter', `scroll-up', or `scroll-down' responses,
 perform the requested window recentering or scrolling and ask
 again.
 
+When `use-dialog-box' is t (the default), this function can pop
+up a dialog window to collect the user input. That functionality
+requires `display-popup-menus-p' to return t. Otherwise, a text
+dialog will be used.
+
 The return value is the matching entry from the CHOICES list.
 
 Usage example: