aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2008-12-23 07:28:06 +0000
committerMartin Rudalics2008-12-23 07:28:06 +0000
commite2749141d61c6127003b9bee567d1bf9ac54a3f6 (patch)
tree08a7d6203a265efa7b057a9476f0392244ae1743 /src
parente230cd7a8f0293303269dc51c46820877a07fd4f (diff)
downloademacs-e2749141d61c6127003b9bee567d1bf9ac54a3f6.tar.gz
emacs-e2749141d61c6127003b9bee567d1bf9ac54a3f6.zip
In comments, write delete_frame instead of Fdelete_frame.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c2
-rw-r--r--src/nsterm.m12
-rw-r--r--src/term.c2
-rw-r--r--src/termhooks.h2
-rw-r--r--src/w32term.c2
-rw-r--r--src/xfaces.c2
6 files changed, 11 insertions, 11 deletions
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)
7040 alone in its group. */ 7040 alone in its group. */
7041 kill (getpid (), SIGHUP); 7041 kill (getpid (), SIGHUP);
7042 7042
7043 /* XXX Is calling delete_terminal safe here? It calls Fdelete_frame. */ 7043 /* XXX Is calling delete_terminal safe here? It calls delete_frame. */
7044 { 7044 {
7045 Lisp_Object tmp; 7045 Lisp_Object tmp;
7046 XSETTERMINAL (tmp, t); 7046 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)
1152 1152
1153 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); 1153 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols);
1154 pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows); 1154 pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
1155 1155
1156 /* If we have a change in toolbar display, calculate height */ 1156 /* If we have a change in toolbar display, calculate height */
1157 if (tb) 1157 if (tb)
1158 /* XXX: GNUstep has not yet implemented the first method below, added 1158 /* XXX: GNUstep has not yet implemented the first method below, added
@@ -1667,7 +1667,7 @@ x_set_frame_alpha (struct frame *f)
1667 alpha = 1.0; 1667 alpha = 1.0;
1668 else if (0.0 <= alpha && alpha < alpha_min && alpha_min <= 1.0) 1668 else if (0.0 <= alpha && alpha < alpha_min && alpha_min <= 1.0)
1669 alpha = alpha_min; 1669 alpha = alpha_min;
1670 1670
1671#ifdef NS_IMPL_COCOA 1671#ifdef NS_IMPL_COCOA
1672 [[view window] setAlphaValue: alpha]; 1672 [[view window] setAlphaValue: alpha];
1673#endif 1673#endif
@@ -1732,7 +1732,7 @@ note_mouse_movement (struct frame *frame, float x, float y)
1732// NSTRACE (note_mouse_movement); 1732// NSTRACE (note_mouse_movement);
1733 1733
1734 XSETFRAME (last_mouse_motion_frame, frame); 1734 XSETFRAME (last_mouse_motion_frame, frame);
1735 1735
1736 /* Note, this doesn't get called for enter/leave, since we don't have a 1736 /* Note, this doesn't get called for enter/leave, since we don't have a
1737 position. Those are taken care of in the corresponding NSView methods. */ 1737 position. Those are taken care of in the corresponding NSView methods. */
1738 1738
@@ -3662,7 +3662,7 @@ ns_delete_terminal (struct terminal *terminal)
3662 struct ns_display_info *dpyinfo = terminal->display_info.ns; 3662 struct ns_display_info *dpyinfo = terminal->display_info.ns;
3663 int i; 3663 int i;
3664 3664
3665 /* Protect against recursive calls. Fdelete_frame in 3665 /* Protect against recursive calls. delete_frame in
3666 delete_terminal calls us back when it deletes our last frame. */ 3666 delete_terminal calls us back when it deletes our last frame. */
3667 if (!terminal->name) 3667 if (!terminal->name)
3668 return; 3668 return;
@@ -4118,7 +4118,7 @@ ns_term_shutdown (int sig)
4118 [NSApp setServicesProvider: NSApp]; 4118 [NSApp setServicesProvider: NSApp];
4119 ns_send_appdefined (-2); 4119 ns_send_appdefined (-2);
4120} 4120}
4121 4121
4122 4122
4123- (void) terminate: (id)sender 4123- (void) terminate: (id)sender
4124{ 4124{
@@ -6313,7 +6313,7 @@ ns_xlfd_to_fontname (const char *xlfd)
6313 char *name = xmalloc (180); 6313 char *name = xmalloc (180);
6314 int i, len; 6314 int i, len;
6315 const char *ret; 6315 const char *ret;
6316 6316
6317 if (!strncmp (xlfd, "--", 2)) 6317 if (!strncmp (xlfd, "--", 2))
6318 sscanf (xlfd, "--%*[^-]-%[^-]179-", name); 6318 sscanf (xlfd, "--%*[^-]-%[^-]179-", name);
6319 else 6319 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)
3926 Lisp_Object tail, frame; 3926 Lisp_Object tail, frame;
3927 int last_terminal; 3927 int last_terminal;
3928 3928
3929 /* Protect against recursive calls. Fdelete_frame in 3929 /* Protect against recursive calls. delete_frame in
3930 delete_terminal calls us back when it deletes our last frame. */ 3930 delete_terminal calls us back when it deletes our last frame. */
3931 if (!terminal->name) 3931 if (!terminal->name)
3932 return; 3932 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
591 instead. Otherwise the hook must call delete_terminal itself. 591 instead. Otherwise the hook must call delete_terminal itself.
592 592
593 The hook must check for and close any live frames that are still 593 The hook must check for and close any live frames that are still
594 on the terminal. Fdelete_frame ensures that there are no live 594 on the terminal. delete_frame ensures that there are no live
595 frames on the terminal when it calls this hook, so infinite 595 frames on the terminal when it calls this hook, so infinite
596 recursion is prevented. */ 596 recursion is prevented. */
597 void (*delete_terminal_hook) P_ ((struct terminal *)); 597 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)
6151 struct w32_display_info *dpyinfo = terminal->display_info.w32; 6151 struct w32_display_info *dpyinfo = terminal->display_info.w32;
6152 int i; 6152 int i;
6153 6153
6154 /* Protect against recursive calls. Fdelete_frame in 6154 /* Protect against recursive calls. delete_frame in
6155 delete_terminal calls us back when it deletes our last frame. */ 6155 delete_terminal calls us back when it deletes our last frame. */
6156 if (!terminal->name) 6156 if (!terminal->name)
6157 return; 6157 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)
874} 874}
875 875
876 876
877/* Free face cache of frame F. Called from Fdelete_frame. */ 877/* Free face cache of frame F. Called from delete_frame. */
878 878
879void 879void
880free_frame_faces (f) 880free_frame_faces (f)