diff options
| author | Chong Yidong | 2009-10-31 17:12:13 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-10-31 17:12:13 +0000 |
| commit | c38eb0274c8fedeb0b4470943f44ba274037eae2 (patch) | |
| tree | eb435cb50766f2113ab4315dfb157c977e43345a /src | |
| parent | 9a5293129d0e7b2b6333a735f054d2273572b1b3 (diff) | |
| download | emacs-c38eb0274c8fedeb0b4470943f44ba274037eae2.tar.gz emacs-c38eb0274c8fedeb0b4470943f44ba274037eae2.zip | |
* frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix
(Bug#4827).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/frame.c | 28 |
2 files changed, 23 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a291d8c1e9c..3c82211c553 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-10-31 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * frame.c (Fmake_frame_invisible, Fframe_visible_p): Doc fix | ||
| 4 | (Bug#4827). | ||
| 5 | |||
| 1 | 2009-10-30 Eli Zaretskii <eliz@gnu.org> | 6 | 2009-10-30 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * s/msdos.h (SYSTEM_PURESIZE_EXTRA): Redefine to waste less pure | 8 | * s/msdos.h (SYSTEM_PURESIZE_EXTRA): Redefine to waste less pure |
diff --git a/src/frame.c b/src/frame.c index 90309a33d8b..2884c16c551 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1880,10 +1880,17 @@ make_frame_visible_1 (window) | |||
| 1880 | 1880 | ||
| 1881 | DEFUN ("make-frame-invisible", Fmake_frame_invisible, Smake_frame_invisible, | 1881 | DEFUN ("make-frame-invisible", Fmake_frame_invisible, Smake_frame_invisible, |
| 1882 | 0, 2, "", | 1882 | 0, 2, "", |
| 1883 | doc: /* Make the frame FRAME invisible (assuming it is an X window). | 1883 | doc: /* Make the frame FRAME invisible. |
| 1884 | If omitted, FRAME defaults to the currently selected frame. | 1884 | If omitted, FRAME defaults to the currently selected frame. |
| 1885 | On graphical displays, invisible frames are not updated and are | ||
| 1886 | usually not displayed at all, even in a window system's \"taskbar\". | ||
| 1887 | |||
| 1885 | Normally you may not make FRAME invisible if all other frames are invisible, | 1888 | Normally you may not make FRAME invisible if all other frames are invisible, |
| 1886 | but if the second optional argument FORCE is non-nil, you may do so. */) | 1889 | but if the second optional argument FORCE is non-nil, you may do so. |
| 1890 | |||
| 1891 | This function has no effect on text-only terminal frames. Such frames | ||
| 1892 | are always considered visible, whether or not they are currently being | ||
| 1893 | displayed in the terminal. */) | ||
| 1887 | (frame, force) | 1894 | (frame, force) |
| 1888 | Lisp_Object frame, force; | 1895 | Lisp_Object frame, force; |
| 1889 | { | 1896 | { |
| @@ -1963,14 +1970,15 @@ If omitted, FRAME defaults to the currently selected frame. */) | |||
| 1963 | 1970 | ||
| 1964 | DEFUN ("frame-visible-p", Fframe_visible_p, Sframe_visible_p, | 1971 | DEFUN ("frame-visible-p", Fframe_visible_p, Sframe_visible_p, |
| 1965 | 1, 1, 0, | 1972 | 1, 1, 0, |
| 1966 | doc: /* Return t if FRAME is now \"visible\" (actually in use for display). | 1973 | doc: /* Return t if FRAME is \"visible\" (actually in use for display). |
| 1967 | A frame that is not \"visible\" is not updated and, if it works through | 1974 | Return the symbol `icon' if FRAME is iconified or \"minimized\". |
| 1968 | a window system, it may not show at all. | 1975 | Return nil if FRAME was made invisible, via `make-frame-invisible'. |
| 1969 | Return the symbol `icon' if frame is visible only as an icon. | 1976 | On graphical displays, invisible frames are not updated and are |
| 1970 | 1977 | usually not displayed at all, even in a window system's \"taskbar\". | |
| 1971 | On a text-only terminal, all frames are considered visible, whether | 1978 | |
| 1972 | they are currently being displayed or not, and this function returns t | 1979 | If FRAME is a text-only terminal frame, this always returns t. |
| 1973 | for all frames. */) | 1980 | Such frames are always considered visible, whether or not they are |
| 1981 | currently being displayed on the terminal. */) | ||
| 1974 | (frame) | 1982 | (frame) |
| 1975 | Lisp_Object frame; | 1983 | Lisp_Object frame; |
| 1976 | { | 1984 | { |