(pop-up-frame-function): Remove choice nil since it

does not represent a valid value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc89e0c3ada655f9d508542ac0cc10deb8c72e58..64ee5cd475863e6c05dac0235f61caa50a56c548 100644 (file)
--- 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 5bdc5821284bcf7ca3bc039a48912a483f32ef6e..534f5f86159e9f4084c9cf0f571d6ced22024d20 100644 (file)
--- 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