aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2004-07-07 22:43:05 +0000
committerLuc Teirlinck2004-07-07 22:43:05 +0000
commitcb4f1287f80e09dab8455312f6bf4f71aaf37307 (patch)
treedefa4b452a4db37ee47f76e558ef99a7eadecd3f
parent339902ec4ad4c746e35432a43983593d7615057f (diff)
downloademacs-cb4f1287f80e09dab8455312f6bf4f71aaf37307.tar.gz
emacs-cb4f1287f80e09dab8455312f6bf4f71aaf37307.zip
(Input Focus): Clarify descriptions of `select-frame-set-input-focus'
and `select-frame'.
-rw-r--r--lispref/ChangeLog5
-rw-r--r--lispref/frames.texi19
2 files changed, 16 insertions, 8 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 145aea753cc..cfe47c3ea5d 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
12004-07-07 Luc Teirlinck <teirllm@auburn.edu>
2
3 * frames.texi (Input Focus): Clarify descriptions of
4 `select-frame-set-input-focus' and `select-frame'.
5
12004-07-06 Luc Teirlinck <teirllm@auburn.edu> 62004-07-06 Luc Teirlinck <teirllm@auburn.edu>
2 7
3 * os.texi: Various small changes in addition to: 8 * os.texi: Various small changes in addition to:
diff --git a/lispref/frames.texi b/lispref/frames.texi
index 8bf157335ca..7188b4f8b97 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -1006,17 +1006,19 @@ concept of focus; rather, it escapes from the window manager's control
1006until that control is somehow reasserted. 1006until that control is somehow reasserted.
1007 1007
1008When using a text-only terminal, only one frame can be displayed at a 1008When using a text-only terminal, only one frame can be displayed at a
1009time on the terminal, so @code{select-frame} actually displays the 1009time on the terminal, so after a call to @code{select-frame}, the next
1010newly selected frame. This frame remains displayed until a subsequent 1010redisplay actually displays the newly selected frame. This frame
1011call to @code{select-frame} or @code{select-frame-set-input-focus}. 1011remains displayed until a subsequent call to @code{select-frame} or
1012Each terminal frame has a number which appears in the mode line before 1012@code{select-frame-set-input-focus}. Each terminal frame has a number
1013the buffer name (@pxref{Mode Line Variables}). 1013which appears in the mode line before the buffer name (@pxref{Mode
1014Line Variables}).
1014 1015
1015@defun select-frame-set-input-focus frame 1016@defun select-frame-set-input-focus frame
1016This function makes @var{frame} the selected frame, raises it (should 1017This function makes @var{frame} the selected frame, raises it (should
1017it happen to be obscured by other frames) and tries to give it the X 1018it happen to be obscured by other frames) and tries to give it the X
1018server's focus. On a text-only terminal, the new frame gets displayed 1019server's focus. On a text-only terminal, the next redisplay displays
1019on the entire terminal screen. 1020the new frame on the entire terminal screen. The return value of this
1021function is not significant.
1020@end defun 1022@end defun
1021 1023
1022@c ??? This is not yet implemented properly. 1024@c ??? This is not yet implemented properly.
@@ -1026,7 +1028,8 @@ focus of the X server if any. The selection of @var{frame} lasts until
1026the next time the user does something to select a different frame, or 1028the next time the user does something to select a different frame, or
1027until the next time this function is called. The specified @var{frame} 1029until the next time this function is called. The specified @var{frame}
1028becomes the selected frame, as explained above, and the terminal that 1030becomes the selected frame, as explained above, and the terminal that
1029@var{frame} is on becomes the selected terminal. 1031@var{frame} is on becomes the selected terminal. This function
1032returns @var{frame}, or @code{nil} if @var{frame} has been deleted.
1030 1033
1031In general, you should never use @code{select-frame} in a way that could 1034In general, you should never use @code{select-frame} in a way that could
1032switch to a different terminal without switching back when you're done. 1035switch to a different terminal without switching back when you're done.