aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1992-06-08 22:48:04 +0000
committerRichard M. Stallman1992-06-08 22:48:04 +0000
commit6869203ed2178f9ade09a27fa91159374f5e7b45 (patch)
tree09e697d176b47ad232ddeff1035518c61a768429 /src
parent69037c38af430201e758f3ce9e2b3e4522e5f679 (diff)
downloademacs-6869203ed2178f9ade09a27fa91159374f5e7b45.tar.gz
emacs-6869203ed2178f9ade09a27fa91159374f5e7b45.zip
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/frame.c29
1 files changed, 7 insertions, 22 deletions
diff --git a/src/frame.c b/src/frame.c
index 4652178e0ff..b1c452afc23 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -572,7 +572,7 @@ and nil for X and Y.")
572 572
573DEFUN ("set-mouse-position", Fset_mouse_position, Sset_mouse_position, 3, 3, 0, 573DEFUN ("set-mouse-position", Fset_mouse_position, Sset_mouse_position, 3, 3, 0,
574 "Move the mouse pointer to the center of cell (X,Y) in SCREEN.\n\ 574 "Move the mouse pointer to the center of cell (X,Y) in SCREEN.\n\
575WARNING: If you use this under X, you should do unfocus-screen afterwards.") 575WARNING: If you use this under X, you should do `unfocus-screen' afterwards.")
576 (screen, x, y) 576 (screen, x, y)
577 Lisp_Object screen, x, y; 577 Lisp_Object screen, x, y;
578{ 578{
@@ -686,20 +686,6 @@ DEFUN ("iconify-screen", Ficonify_screen, Siconify_screen,
686 return Qnil; 686 return Qnil;
687} 687}
688 688
689DEFUN ("deiconify-screen", Fdeiconify_screen, Sdeiconify_screen,
690 1, 1, 0,
691 "Open (de-iconify) the iconified screen SCREEN.")
692 (screen)
693 Lisp_Object screen;
694{
695 CHECK_LIVE_SCREEN (screen, 0);
696
697 if (SCREEN_IS_X (XSCREEN (screen)))
698 x_make_screen_visible (XSCREEN (screen));
699
700 return screen;
701}
702
703DEFUN ("screen-visible-p", Fscreen_visible_p, Sscreen_visible_p, 689DEFUN ("screen-visible-p", Fscreen_visible_p, Sscreen_visible_p,
704 1, 1, 0, 690 1, 1, 0,
705 "Return t if SCREEN is now \"visible\" (actually in use for display).\n\ 691 "Return t if SCREEN is now \"visible\" (actually in use for display).\n\
@@ -746,13 +732,13 @@ DEFUN ("redirect-screen-focus", Fredirect_screen_focus, Sredirect_screen_focus,
746 1, 2, 0, 732 1, 2, 0,
747 "Arrange for keystrokes typed at SCREEN to be sent to FOCUS-SCREEN.\n\ 733 "Arrange for keystrokes typed at SCREEN to be sent to FOCUS-SCREEN.\n\
748This means that, after reading a keystroke typed at SCREEN,\n\ 734This means that, after reading a keystroke typed at SCREEN,\n\
749last-event-screen will be FOCUS-SCREEN.\n\ 735`last-event-screen' will be FOCUS-SCREEN.\n\
750\n\ 736\n\
751If FOCUS-SCREEN is omitted or eq to SCREEN, any existing redirection is\n\ 737If FOCUS-SCREEN is omitted or eq to SCREEN, any existing redirection is\n\
752cancelled, and the screen again receives its own keystrokes.\n\ 738cancelled, and the screen again receives its own keystrokes.\n\
753\n\ 739\n\
754The redirection lasts until the next call to redirect-screen-focus\n\ 740The redirection lasts until the next call to `redirect-screen-focus'\n\
755or select-screen.\n\ 741or `select-screen'.\n\
756\n\ 742\n\
757This is useful for temporarily redirecting keystrokes to the minibuffer\n\ 743This is useful for temporarily redirecting keystrokes to the minibuffer\n\
758window when a screen doesn't have its own minibuffer.") 744window when a screen doesn't have its own minibuffer.")
@@ -777,7 +763,7 @@ window when a screen doesn't have its own minibuffer.")
777 763
778DEFUN ("screen-focus", Fscreen_focus, Sscreen_focus, 1, 1, 0, 764DEFUN ("screen-focus", Fscreen_focus, Sscreen_focus, 1, 1, 0,
779 "Return the screen to which SCREEN's keystrokes are currently being sent.\n\ 765 "Return the screen to which SCREEN's keystrokes are currently being sent.\n\
780See redirect-screen-focus.") 766See `redirect-screen-focus'.")
781 (screen) 767 (screen)
782 Lisp_Object screen; 768 Lisp_Object screen;
783{ 769{
@@ -1141,9 +1127,9 @@ These may be set in your init file, like this:\n\
1141 (setq default-screen-alist '((width . 80) (height . 55)))\n\ 1127 (setq default-screen-alist '((width . 80) (height . 55)))\n\
1142These override values given in window system configuration data, like\n\ 1128These override values given in window system configuration data, like\n\
1143X Windows' defaults database.\n\ 1129X Windows' defaults database.\n\
1144For values specific to the first emacs screen, see initial-screen-alist.\n\ 1130For values specific to the first Emacs screen, see `initial-screen-alist'.\n\
1145For values specific to the separate minibuffer screen, see\n\ 1131For values specific to the separate minibuffer screen, see\n\
1146minibuffer-screen-alist."); 1132`minibuffer-screen-alist'.");
1147 Vdefault_screen_alist = Qnil; 1133 Vdefault_screen_alist = Qnil;
1148 1134
1149 defsubr (&Sscreenp); 1135 defsubr (&Sscreenp);
@@ -1165,7 +1151,6 @@ minibuffer-screen-alist.");
1165 defsubr (&Smake_screen_visible); 1151 defsubr (&Smake_screen_visible);
1166 defsubr (&Smake_screen_invisible); 1152 defsubr (&Smake_screen_invisible);
1167 defsubr (&Siconify_screen); 1153 defsubr (&Siconify_screen);
1168 defsubr (&Sdeiconify_screen);
1169 defsubr (&Sscreen_visible_p); 1154 defsubr (&Sscreen_visible_p);
1170 defsubr (&Svisible_screen_list); 1155 defsubr (&Svisible_screen_list);
1171 defsubr (&Sredirect_screen_focus); 1156 defsubr (&Sredirect_screen_focus);