aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-09-17 20:50:18 -0700
committerGlenn Morris2013-09-17 20:50:18 -0700
commitd2f3e9f85b5d46fbb128548a9ff78bd15c0bd252 (patch)
treec36d19b7083326db8f70ba11862e381eba4018d6
parent8a78544ece0e8939032c0fc4302ec057dd021ea5 (diff)
downloademacs-d2f3e9f85b5d46fbb128548a9ff78bd15c0bd252.tar.gz
emacs-d2f3e9f85b5d46fbb128548a9ff78bd15c0bd252.zip
* lisp/subr.el (x-popup-dialog): Declare.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/subr.el3
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0875fca369a..cb19644cbe1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -12,6 +12,8 @@
12 12
13 * simple.el (font-info): Declare. 13 * simple.el (font-info): Declare.
14 14
15 * subr.el (x-popup-dialog): Declare.
16
15 * window.el (x-display-pixel-height, tool-bar-lines-needed): Declare. 17 * window.el (x-display-pixel-height, tool-bar-lines-needed): Declare.
16 (fit-frame-to-buffer): Explicit error if --without-x. 18 (fit-frame-to-buffer): Explicit error if --without-x.
17 (mouse-autoselect-window-select): Silence compiler. 19 (mouse-autoselect-window-select): Silence compiler.
diff --git a/lisp/subr.el b/lisp/subr.el
index adf3f9a97f2..b903ef1ea96 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2239,6 +2239,9 @@ floating point support."
2239 (push read unread-command-events) 2239 (push read unread-command-events)
2240 nil)))))) 2240 nil))))))
2241 2241
2242;; Behind display-popup-menus-p test.
2243(declare-function x-popup-dialog "xmenu.c" (position contents &optional header))
2244
2242(defun y-or-n-p (prompt) 2245(defun y-or-n-p (prompt)
2243 "Ask user a \"y or n\" question. Return t if answer is \"y\". 2246 "Ask user a \"y or n\" question. Return t if answer is \"y\".
2244PROMPT is the string to display to ask the question. It should 2247PROMPT is the string to display to ask the question. It should