aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2007-10-26 01:59:44 +0000
committerJuanma Barranquero2007-10-26 01:59:44 +0000
commita3547743e7c46b886d8b14c4098c005620b9a077 (patch)
treedc8cd02e730ed7d9d34e20ba8113217ebc13f37c /src
parent0bde6a03c6a9da54e14df5958dde1ac0876679e8 (diff)
downloademacs-a3547743e7c46b886d8b14c4098c005620b9a077.tar.gz
emacs-a3547743e7c46b886d8b14c4098c005620b9a077.zip
(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/frame.c46
2 files changed, 28 insertions, 23 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e2dd2a4f59f..f501559a1f2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12007-10-26 Juanma Barranquero <lekktu@gmail.com>
2
3 * frame.c (syms_of_frame) <delete-frame-functions>:
4 Fix typo in docstring.
5
12007-10-25 Juanma Barranquero <lekktu@gmail.com> 62007-10-25 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * w32.c (init_environment): Fix tiny memory leak. 8 * w32.c (init_environment): Fix tiny memory leak.
diff --git a/src/frame.c b/src/frame.c
index ab778ae084a..844a749119c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -260,7 +260,7 @@ FRAME defaults to the currently selected frame. */)
260 return Qnil; 260 return Qnil;
261 else 261 else
262 return type; 262 return type;
263} 263}
264 264
265struct frame * 265struct frame *
266make_frame (mini_p) 266make_frame (mini_p)
@@ -546,10 +546,10 @@ make_initial_frame (void)
546 f->terminal = terminal; 546 f->terminal = terminal;
547 f->terminal->reference_count++; 547 f->terminal->reference_count++;
548 f->output_data.nothing = 0; 548 f->output_data.nothing = 0;
549 549
550 FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; 550 FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
551 FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; 551 FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
552 552
553 FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; 553 FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
554 FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; 554 FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
555 555
@@ -611,10 +611,10 @@ make_terminal_frame (struct terminal *terminal)
611 f->terminal = terminal; 611 f->terminal = terminal;
612 f->terminal->reference_count++; 612 f->terminal->reference_count++;
613 create_tty_output (f); 613 create_tty_output (f);
614 614
615 FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; 615 FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
616 FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; 616 FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
617 617
618 FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; 618 FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
619 FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; 619 FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
620 620
@@ -622,10 +622,10 @@ make_terminal_frame (struct terminal *terminal)
622 if (FRAMEP (FRAME_TTY (f)->top_frame) 622 if (FRAMEP (FRAME_TTY (f)->top_frame)
623 && FRAME_LIVE_P (XFRAME (FRAME_TTY (f)->top_frame))) 623 && FRAME_LIVE_P (XFRAME (FRAME_TTY (f)->top_frame)))
624 XFRAME (FRAME_TTY (f)->top_frame)->async_visible = 2; /* obscured */ 624 XFRAME (FRAME_TTY (f)->top_frame)->async_visible = 2; /* obscured */
625 625
626 FRAME_TTY (f)->top_frame = frame; 626 FRAME_TTY (f)->top_frame = frame;
627 } 627 }
628 628
629#ifdef CANNOT_DUMP 629#ifdef CANNOT_DUMP
630 FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR; 630 FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR;
631 FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR; 631 FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR;
@@ -709,7 +709,7 @@ affects all frames on the same terminal device. */)
709#endif 709#endif
710#endif 710#endif
711#endif /* not MSDOS */ 711#endif /* not MSDOS */
712 712
713 { 713 {
714 Lisp_Object terminal; 714 Lisp_Object terminal;
715 715
@@ -720,9 +720,9 @@ affects all frames on the same terminal device. */)
720 t = get_terminal (terminal, 1); 720 t = get_terminal (terminal, 1);
721 } 721 }
722 } 722 }
723 723
724 if (!t) 724 if (!t)
725 { 725 {
726 char *name = 0, *type = 0; 726 char *name = 0, *type = 0;
727 Lisp_Object tty, tty_type; 727 Lisp_Object tty, tty_type;
728 728
@@ -736,7 +736,7 @@ affects all frames on the same terminal device. */)
736 strncpy (name, SDATA (tty), SBYTES (tty)); 736 strncpy (name, SDATA (tty), SBYTES (tty));
737 name[SBYTES (tty)] = 0; 737 name[SBYTES (tty)] = 0;
738 } 738 }
739 739
740 tty_type = get_future_frame_param 740 tty_type = get_future_frame_param
741 (Qtty_type, parms, (FRAME_TERMCAP_P (XFRAME (selected_frame)) 741 (Qtty_type, parms, (FRAME_TERMCAP_P (XFRAME (selected_frame))
742 ? FRAME_TTY (XFRAME (selected_frame))->type 742 ? FRAME_TTY (XFRAME (selected_frame))->type
@@ -758,7 +758,7 @@ affects all frames on the same terminal device. */)
758 get_tty_size (fileno (FRAME_TTY (f)->input), &width, &height); 758 get_tty_size (fileno (FRAME_TTY (f)->input), &width, &height);
759 change_frame_size (f, height, width, 0, 0, 0); 759 change_frame_size (f, height, width, 0, 0, 0);
760 } 760 }
761 761
762 adjust_glyphs (f); 762 adjust_glyphs (f);
763 calculate_costs (f); 763 calculate_costs (f);
764 XSETFRAME (frame, f); 764 XSETFRAME (frame, f);
@@ -773,7 +773,7 @@ affects all frames on the same terminal device. */)
773 Qnil)); 773 Qnil));
774 else 774 else
775 Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty, Qnil), Qnil)); 775 Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty, Qnil), Qnil));
776 776
777 /* Make the frame face alist be frame-specific, so that each 777 /* Make the frame face alist be frame-specific, so that each
778 frame could change its face definitions independently. */ 778 frame could change its face definitions independently. */
779 f->face_alist = Fcopy_alist (sf->face_alist); 779 f->face_alist = Fcopy_alist (sf->face_alist);
@@ -1519,7 +1519,7 @@ The functions are run with one arg, the frame to be deleted. */)
1519 1519
1520 { 1520 {
1521 struct terminal *terminal = FRAME_TERMINAL (f); 1521 struct terminal *terminal = FRAME_TERMINAL (f);
1522 f->output_data.nothing = 0; 1522 f->output_data.nothing = 0;
1523 f->terminal = 0; /* Now the frame is dead. */ 1523 f->terminal = 0; /* Now the frame is dead. */
1524 1524
1525 /* If needed, delete the terminal that this frame was on. 1525 /* If needed, delete the terminal that this frame was on.
@@ -2026,7 +2026,7 @@ doesn't support multiple overlapping frames, this function does nothing. */)
2026 CHECK_LIVE_FRAME (frame); 2026 CHECK_LIVE_FRAME (frame);
2027 2027
2028 f = XFRAME (frame); 2028 f = XFRAME (frame);
2029 2029
2030 /* Do like the documentation says. */ 2030 /* Do like the documentation says. */
2031 Fmake_frame_visible (frame); 2031 Fmake_frame_visible (frame);
2032 2032
@@ -2046,14 +2046,14 @@ doesn't support multiple overlapping frames, this function does nothing. */)
2046 Lisp_Object frame; 2046 Lisp_Object frame;
2047{ 2047{
2048 struct frame *f; 2048 struct frame *f;
2049 2049
2050 if (NILP (frame)) 2050 if (NILP (frame))
2051 frame = selected_frame; 2051 frame = selected_frame;
2052 2052
2053 CHECK_LIVE_FRAME (frame); 2053 CHECK_LIVE_FRAME (frame);
2054 2054
2055 f = XFRAME (frame); 2055 f = XFRAME (frame);
2056 2056
2057 if (FRAME_TERMINAL (f)->frame_raise_lower_hook) 2057 if (FRAME_TERMINAL (f)->frame_raise_lower_hook)
2058 (*FRAME_TERMINAL (f)->frame_raise_lower_hook) (f, 0); 2058 (*FRAME_TERMINAL (f)->frame_raise_lower_hook) (f, 0);
2059 2059
@@ -2090,7 +2090,7 @@ The redirection lasts until `redirect-frame-focus' is called to change it. */)
2090 Lisp_Object frame, focus_frame; 2090 Lisp_Object frame, focus_frame;
2091{ 2091{
2092 struct frame *f; 2092 struct frame *f;
2093 2093
2094 /* Note that we don't check for a live frame here. It's reasonable 2094 /* Note that we don't check for a live frame here. It's reasonable
2095 to redirect the focus of a frame you're about to delete, if you 2095 to redirect the focus of a frame you're about to delete, if you
2096 know what other frame should receive those keystrokes. */ 2096 know what other frame should receive those keystrokes. */
@@ -2100,7 +2100,7 @@ The redirection lasts until `redirect-frame-focus' is called to change it. */)
2100 CHECK_LIVE_FRAME (focus_frame); 2100 CHECK_LIVE_FRAME (focus_frame);
2101 2101
2102 f = XFRAME (frame); 2102 f = XFRAME (frame);
2103 2103
2104 f->focus_frame = focus_frame; 2104 f->focus_frame = focus_frame;
2105 2105
2106 if (FRAME_TERMINAL (f)->frame_rehighlight_hook) 2106 if (FRAME_TERMINAL (f)->frame_rehighlight_hook)
@@ -3289,7 +3289,7 @@ x_set_fullscreen (f, new_value, old_value)
3289 else if (EQ (new_value, Qfullheight)) 3289 else if (EQ (new_value, Qfullheight))
3290 f->want_fullscreen = FULLSCREEN_HEIGHT; 3290 f->want_fullscreen = FULLSCREEN_HEIGHT;
3291 3291
3292 if (FRAME_TERMINAL (f)->fullscreen_hook != NULL) 3292 if (FRAME_TERMINAL (f)->fullscreen_hook != NULL)
3293 FRAME_TERMINAL (f)->fullscreen_hook (f); 3293 FRAME_TERMINAL (f)->fullscreen_hook (f);
3294} 3294}
3295 3295
@@ -4315,7 +4315,7 @@ syms_of_frame ()
4315 staticpro (&Qterminal); 4315 staticpro (&Qterminal);
4316 Qterminal_live_p = intern ("terminal-live-p"); 4316 Qterminal_live_p = intern ("terminal-live-p");
4317 staticpro (&Qterminal_live_p); 4317 staticpro (&Qterminal_live_p);
4318 4318
4319 { 4319 {
4320 int i; 4320 int i;
4321 4321
@@ -4417,7 +4417,7 @@ Note that functions in this list may be called twice on the same
4417frame. In the second invocation, the frame is already deleted, and 4417frame. In the second invocation, the frame is already deleted, and
4418the function should do nothing. (You can use `frame-live-p' to check 4418the function should do nothing. (You can use `frame-live-p' to check
4419for this.) This wrinkle happens when an earlier function in 4419for this.) This wrinkle happens when an earlier function in
4420`delete-frame-functions' (indirectly) calls delete-frame 4420`delete-frame-functions' (indirectly) calls `delete-frame'
4421recursively. */); 4421recursively. */);
4422 Vdelete_frame_functions = Qnil; 4422 Vdelete_frame_functions = Qnil;
4423 4423
@@ -4450,7 +4450,7 @@ automatically. */);
4450#else 4450#else
4451 focus_follows_mouse = 0; 4451 focus_follows_mouse = 0;
4452#endif 4452#endif
4453 4453
4454 staticpro (&Vframe_list); 4454 staticpro (&Vframe_list);
4455 4455
4456 defsubr (&Sactive_minibuffer_window); 4456 defsubr (&Sactive_minibuffer_window);