summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/frame.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc89e0c3ada..64ee5cd4758 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-02 Martin Rudalics <rudalics@gmx.at>
+
+ * frame.el (pop-up-frame-function): Remove choice nil since it
+ does not represent a valid value.
+
2009-04-30 David Reitter <david.reitter@gmail.com>
* term/ns-win.el (ns-make-command-string, ns-grabenv)
diff --git a/lisp/frame.el b/lisp/frame.el
index 5bdc5821284..534f5f86159 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -120,7 +120,7 @@ affected by this variable."
This function is called with no arguments and should return a new
frame. The default value calls `make-frame' with the argument
`pop-up-frame-alist'."
- :type '(choice (const nil) (function :tag "function"))
+ :type 'function
:group 'frames)
(defcustom special-display-frame-alist