# HG changeset patch
# User Martin Rudalics <rudalics@gmx.at>
# Date 1241253205 0
# Node ID e1c910297520966b23cb13aa9a404733a40d4ed5
# Parent  39d736fd93b7d1e025ff93f643e4cec599d1ee27
(pop-up-frame-function): Remove choice nil since it
does not represent a valid value.

diff -r 39d736fd93b7 -r e1c910297520 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 01 15:32:34 2009 +0000
+++ b/lisp/ChangeLog	Sat May 02 08:33:25 2009 +0000
@@ -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 -r 39d736fd93b7 -r e1c910297520 lisp/frame.el
--- a/lisp/frame.el	Fri May 01 15:32:34 2009 +0000
+++ b/lisp/frame.el	Sat May 02 08:33:25 2009 +0000
@@ -120,7 +120,7 @@
 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