Merge from origin/emacs-24

[gnu-emacs] / lisp / emacs-lisp / map-ynp.el

diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index 1919d47687bedf41880be7f648043b71abf54c91..08b34fbe2fef6896b99f936abcb4a2bd5f35491f 100644 (file)
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -1,9 +1,9 @@
 ;;; map-ynp.el --- general-purpose boolean question-asker  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1991-1995, 2000-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1991-1995, 2000-2015 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: lisp, extensions
 ;; Package: emacs
 
@@ -34,7 +34,7 @@
 
 ;;; Code:
 
-(declare-function x-popup-dialog "xmenu.c" (position contents &optional header))
+(declare-function x-popup-dialog "menu.c" (position contents &optional header))
 
 (defun map-y-or-n-p (prompter actor list &optional help action-alist
                              no-cursor-in-echo-area)
@@ -131,8 +131,9 @@ Returns the number of actions taken."
     (unwind-protect
        (progn
          (if (stringp prompter)
-             (setq prompter (lambda (object)
-                              (format prompter object))))
+             (setq prompter (let ((prompter prompter))
+                              (lambda (object)
+                                (format prompter object)))))
          (while (funcall next)
            (setq prompt (funcall prompter elt))
            (cond ((stringp prompt)