Mercurial > emacs
changeset 100666:dab9cf44bf3f
In comments, write delete_frame instead of Fdelete_frame.
| author | Martin Rudalics <rudalics@gmx.at> |
|---|---|
| date | Tue, 23 Dec 2008 07:28:06 +0000 |
| parents | 5bd9286fbc2a |
| children | d5b2b9c1f3f8 |
| files | src/keyboard.c src/nsterm.m src/term.c src/termhooks.h src/w32term.c src/xfaces.c |
| diffstat | 6 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keyboard.c Tue Dec 23 07:02:32 2008 +0000 +++ b/src/keyboard.c Tue Dec 23 07:28:06 2008 +0000 @@ -7040,7 +7040,7 @@ alone in its group. */ kill (getpid (), SIGHUP); - /* XXX Is calling delete_terminal safe here? It calls Fdelete_frame. */ + /* XXX Is calling delete_terminal safe here? It calls delete_frame. */ { Lisp_Object tmp; XSETTERMINAL (tmp, t);
--- a/src/nsterm.m Tue Dec 23 07:02:32 2008 +0000 +++ b/src/nsterm.m Tue Dec 23 07:28:06 2008 +0000 @@ -1152,7 +1152,7 @@ pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows); - + /* If we have a change in toolbar display, calculate height */ if (tb) /* XXX: GNUstep has not yet implemented the first method below, added @@ -1667,7 +1667,7 @@ alpha = 1.0; else if (0.0 <= alpha && alpha < alpha_min && alpha_min <= 1.0) alpha = alpha_min; - + #ifdef NS_IMPL_COCOA [[view window] setAlphaValue: alpha]; #endif @@ -1732,7 +1732,7 @@ // NSTRACE (note_mouse_movement); XSETFRAME (last_mouse_motion_frame, frame); - + /* Note, this doesn't get called for enter/leave, since we don't have a position. Those are taken care of in the corresponding NSView methods. */ @@ -3662,7 +3662,7 @@ struct ns_display_info *dpyinfo = terminal->display_info.ns; int i; - /* Protect against recursive calls. Fdelete_frame in + /* Protect against recursive calls. delete_frame in delete_terminal calls us back when it deletes our last frame. */ if (!terminal->name) return; @@ -4118,7 +4118,7 @@ [NSApp setServicesProvider: NSApp]; ns_send_appdefined (-2); } - + - (void) terminate: (id)sender { @@ -6313,7 +6313,7 @@ char *name = xmalloc (180); int i, len; const char *ret; - + if (!strncmp (xlfd, "--", 2)) sscanf (xlfd, "--%*[^-]-%[^-]179-", name); else
--- a/src/term.c Tue Dec 23 07:02:32 2008 +0000 +++ b/src/term.c Tue Dec 23 07:28:06 2008 +0000 @@ -3926,7 +3926,7 @@ Lisp_Object tail, frame; int last_terminal; - /* Protect against recursive calls. Fdelete_frame in + /* Protect against recursive calls. delete_frame in delete_terminal calls us back when it deletes our last frame. */ if (!terminal->name) return;
--- a/src/termhooks.h Tue Dec 23 07:02:32 2008 +0000 +++ b/src/termhooks.h Tue Dec 23 07:28:06 2008 +0000 @@ -591,7 +591,7 @@ instead. Otherwise the hook must call delete_terminal itself. The hook must check for and close any live frames that are still - on the terminal. Fdelete_frame ensures that there are no live + on the terminal. delete_frame ensures that there are no live frames on the terminal when it calls this hook, so infinite recursion is prevented. */ void (*delete_terminal_hook) P_ ((struct terminal *));
--- a/src/w32term.c Tue Dec 23 07:02:32 2008 +0000 +++ b/src/w32term.c Tue Dec 23 07:28:06 2008 +0000 @@ -6151,7 +6151,7 @@ struct w32_display_info *dpyinfo = terminal->display_info.w32; int i; - /* Protect against recursive calls. Fdelete_frame in + /* Protect against recursive calls. delete_frame in delete_terminal calls us back when it deletes our last frame. */ if (!terminal->name) return;