From: Martin Rudalics Date: Tue, 23 Dec 2008 07:28:06 +0000 (+0000) Subject: In comments, write delete_frame instead of Fdelete_frame. X-Git-Tag: emacs-pretest-23.0.90~888 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e2749141d61c6127003b9bee567d1bf9ac54a3f6;p=emacs.git In comments, write delete_frame instead of Fdelete_frame. --- diff --git a/src/keyboard.c b/src/keyboard.c index 6f6b094e88c..35257c6d999 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -7040,7 +7040,7 @@ read_avail_input (expected) 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); diff --git a/src/nsterm.m b/src/nsterm.m index fbb6e91612e..f7854256996 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1152,7 +1152,7 @@ x_set_window_size (struct frame *f, int change_grav, int cols, int rows) 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 @@ x_set_frame_alpha (struct frame *f) 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 @@ note_mouse_movement (struct frame *frame, float x, float y) // 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 @@ ns_delete_terminal (struct terminal *terminal) 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 @@ ns_term_shutdown (int sig) [NSApp setServicesProvider: NSApp]; ns_send_appdefined (-2); } - + - (void) terminate: (id)sender { @@ -6313,7 +6313,7 @@ ns_xlfd_to_fontname (const char *xlfd) char *name = xmalloc (180); int i, len; const char *ret; - + if (!strncmp (xlfd, "--", 2)) sscanf (xlfd, "--%*[^-]-%[^-]179-", name); else diff --git a/src/term.c b/src/term.c index 4beb90dc014..d092cfa24b1 100644 --- a/src/term.c +++ b/src/term.c @@ -3926,7 +3926,7 @@ delete_tty (struct terminal *terminal) 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; diff --git a/src/termhooks.h b/src/termhooks.h index 71a935420d5..c4699f8b5c7 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -591,7 +591,7 @@ struct terminal 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 *)); diff --git a/src/w32term.c b/src/w32term.c index 470c9d0a04a..aab2d0d7473 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6151,7 +6151,7 @@ x_delete_terminal (struct terminal *terminal) 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; diff --git a/src/xfaces.c b/src/xfaces.c index acadc434738..4e5107a5932 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -874,7 +874,7 @@ init_frame_faces (f) } -/* Free face cache of frame F. Called from Fdelete_frame. */ +/* Free face cache of frame F. Called from delete_frame. */ void free_frame_faces (f)