aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-04-04 14:44:10 +0000
committerChong Yidong2009-04-04 14:44:10 +0000
commitd51f6378fc536647300546365e6846138dc80ff2 (patch)
treebf2668562a4f918d528d1d9c371f31db1762d3f9
parent435f0dd2f5b673f238f75f04d835f72fa5be8cfa (diff)
downloademacs-d51f6378fc536647300546365e6846138dc80ff2.tar.gz
emacs-d51f6378fc536647300546365e6846138dc80ff2.zip
* frame.el (make-frame): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/frame.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bd468c2752..378108d2b06 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-04-04 Chong Yidong <cyd@stupidchicken.com>
2
3 * frame.el (make-frame): Doc fix.
4
12009-04-04 Eli Zaretskii <eliz@gnu.org> 52009-04-04 Eli Zaretskii <eliz@gnu.org>
2 6
3 * mail/rmailsum.el (rmail-new-summary-1): Don't show zero count of 7 * mail/rmailsum.el (rmail-new-summary-1): Don't show zero count of
diff --git a/lisp/frame.el b/lisp/frame.el
index 1576ae7e4c2..5bdc5821284 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -732,7 +732,7 @@ You cannot specify either `width' or `height', you must use neither or both.
732 (window-system . nil) The frame should be displayed on a terminal device. 732 (window-system . nil) The frame should be displayed on a terminal device.
733 (window-system . x) The frame should be displayed in an X window. 733 (window-system . x) The frame should be displayed in an X window.
734 734
735 (terminal . ID) The frame should use the terminal identified by ID. 735 (terminal . TERMINAL) The frame should use the terminal object TERMINAL.
736 736
737Before the frame is created (via `frame-creation-function-alist'), functions on the 737Before the frame is created (via `frame-creation-function-alist'), functions on the
738hook `before-make-frame-hook' are run. After the frame is created, functions 738hook `before-make-frame-hook' are run. After the frame is created, functions