summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/frame.el10
2 files changed, 12 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75ef6fc72f2..5f518b6fd08 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-03 Martin Rudalics <rudalics@gmx.at>
+
+ * window.el (pop-up-frame-function): Move ...
+ * frame.el (pop-up-frame-function): ... here, to avoid
+ "CHANGED outside Customize;".
+
2008-09-03 Glenn Morris <rgm@gnu.org>
* buff-menu.el (buffer-menu-mode-hook): Add obsolete alias.
diff --git a/lisp/frame.el b/lisp/frame.el
index ff644c67b2a..5454ac8f58c 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -99,10 +99,12 @@ for pop-up frames."
(sexp :tag "Value")))
:group 'frames)
-(setq pop-up-frame-function
- ;; Using `function' here caused some sort of problem.
- '(lambda ()
- (make-frame pop-up-frame-alist)))
+(defcustom pop-up-frame-function
+ (lambda () (make-frame pop-up-frame-alist))
+ "Function to call to handle automatic new frame creation.
+It is called with no arguments and should return a newly created frame."
+ :type '(choice (const nil) (function :tag "function"))
+ :group 'frames)
(defcustom special-display-frame-alist
'((height . 14) (width . 80) (unsplittable . t))