Commit e2749141 authored by Martin Rudalics's avatar Martin Rudalics

In comments, write delete_frame instead of Fdelete_frame.

parent e230cd7a
...@@ -7040,7 +7040,7 @@ read_avail_input (expected) ...@@ -7040,7 +7040,7 @@ read_avail_input (expected)
alone in its group. */ alone in its group. */
kill (getpid (), SIGHUP); 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; Lisp_Object tmp;
XSETTERMINAL (tmp, t); XSETTERMINAL (tmp, t);
......
...@@ -1152,7 +1152,7 @@ Free a pool and temporary objects it refers to (callable from C) ...@@ -1152,7 +1152,7 @@ Free a pool and temporary objects it refers to (callable from C)
pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols);
pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows); pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
/* If we have a change in toolbar display, calculate height */ /* If we have a change in toolbar display, calculate height */
if (tb) if (tb)
/* XXX: GNUstep has not yet implemented the first method below, added /* XXX: GNUstep has not yet implemented the first method below, added
...@@ -1667,7 +1667,7 @@ Free a pool and temporary objects it refers to (callable from C) ...@@ -1667,7 +1667,7 @@ Free a pool and temporary objects it refers to (callable from C)
alpha = 1.0; alpha = 1.0;
else if (0.0 <= alpha && alpha < alpha_min && alpha_min <= 1.0) else if (0.0 <= alpha && alpha < alpha_min && alpha_min <= 1.0)
alpha = alpha_min; alpha = alpha_min;
#ifdef NS_IMPL_COCOA #ifdef NS_IMPL_COCOA
[[view window] setAlphaValue: alpha]; [[view window] setAlphaValue: alpha];
#endif #endif
...@@ -1732,7 +1732,7 @@ Free a pool and temporary objects it refers to (callable from C) ...@@ -1732,7 +1732,7 @@ Free a pool and temporary objects it refers to (callable from C)
// NSTRACE (note_mouse_movement); // NSTRACE (note_mouse_movement);
XSETFRAME (last_mouse_motion_frame, frame); XSETFRAME (last_mouse_motion_frame, frame);
/* Note, this doesn't get called for enter/leave, since we don't have a /* 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. */ position. Those are taken care of in the corresponding NSView methods. */
...@@ -3662,7 +3662,7 @@ functions in this file (well, many of them, anyway). */ ...@@ -3662,7 +3662,7 @@ functions in this file (well, many of them, anyway). */
struct ns_display_info *dpyinfo = terminal->display_info.ns; struct ns_display_info *dpyinfo = terminal->display_info.ns;
int i; 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. */ delete_terminal calls us back when it deletes our last frame. */
if (!terminal->name) if (!terminal->name)
return; return;
...@@ -4118,7 +4118,7 @@ - (void)applicationDidFinishLaunching: (NSNotification *)notification ...@@ -4118,7 +4118,7 @@ - (void)applicationDidFinishLaunching: (NSNotification *)notification
[NSApp setServicesProvider: NSApp]; [NSApp setServicesProvider: NSApp];
ns_send_appdefined (-2); ns_send_appdefined (-2);
} }
- (void) terminate: (id)sender - (void) terminate: (id)sender
{ {
...@@ -6313,7 +6313,7 @@ Convert an X font name (XLFD) to an NS font name. ...@@ -6313,7 +6313,7 @@ Convert an X font name (XLFD) to an NS font name.
char *name = xmalloc (180); char *name = xmalloc (180);
int i, len; int i, len;
const char *ret; const char *ret;
if (!strncmp (xlfd, "--", 2)) if (!strncmp (xlfd, "--", 2))
sscanf (xlfd, "--%*[^-]-%[^-]179-", name); sscanf (xlfd, "--%*[^-]-%[^-]179-", name);
else else
......
...@@ -3926,7 +3926,7 @@ delete_tty (struct terminal *terminal) ...@@ -3926,7 +3926,7 @@ delete_tty (struct terminal *terminal)
Lisp_Object tail, frame; Lisp_Object tail, frame;
int last_terminal; 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. */ delete_terminal calls us back when it deletes our last frame. */
if (!terminal->name) if (!terminal->name)
return; return;
......
...@@ -591,7 +591,7 @@ struct terminal ...@@ -591,7 +591,7 @@ struct terminal
instead. Otherwise the hook must call delete_terminal itself. instead. Otherwise the hook must call delete_terminal itself.
The hook must check for and close any live frames that are still 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 frames on the terminal when it calls this hook, so infinite
recursion is prevented. */ recursion is prevented. */
void (*delete_terminal_hook) P_ ((struct terminal *)); void (*delete_terminal_hook) P_ ((struct terminal *));
......
...@@ -6151,7 +6151,7 @@ x_delete_terminal (struct terminal *terminal) ...@@ -6151,7 +6151,7 @@ x_delete_terminal (struct terminal *terminal)
struct w32_display_info *dpyinfo = terminal->display_info.w32; struct w32_display_info *dpyinfo = terminal->display_info.w32;
int i; 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. */ delete_terminal calls us back when it deletes our last frame. */
if (!terminal->name) if (!terminal->name)
return; return;
......
...@@ -874,7 +874,7 @@ init_frame_faces (f) ...@@ -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 void
free_frame_faces (f) free_frame_faces (f)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment