diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/alloc.c | 2 | ||||
| -rw-r--r-- | src/nsterm.h | 4 | ||||
| -rw-r--r-- | src/nsterm.m | 14 | ||||
| -rw-r--r-- | src/window.c | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/alloc.c b/src/alloc.c index 81d644a16ad..bee7cd1758d 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -5346,7 +5346,7 @@ compact_font_cache_entry (Lisp_Object entry) | |||
| 5346 | } | 5346 | } |
| 5347 | if (CONSP (objlist)) | 5347 | if (CONSP (objlist)) |
| 5348 | { | 5348 | { |
| 5349 | /* Foiund a marked font, bail out. */ | 5349 | /* Found a marked font, bail out. */ |
| 5350 | break; | 5350 | break; |
| 5351 | } | 5351 | } |
| 5352 | } | 5352 | } |
diff --git a/src/nsterm.h b/src/nsterm.h index 3fb8cfc9cd8..1b330f08636 100644 --- a/src/nsterm.h +++ b/src/nsterm.h | |||
| @@ -126,7 +126,7 @@ nsterm.m : 6718: [ 4453] | | | | +->> (X:0 Y:0)/(W:1600 H:1177) | |||
| 126 | 126 | ||
| 127 | Here, "ns_fullscreen_hook" calls "handleFS", which is turn calls | 127 | Here, "ns_fullscreen_hook" calls "handleFS", which is turn calls |
| 128 | "performZoom". This function calls "[super performZoom]", which | 128 | "performZoom". This function calls "[super performZoom]", which |
| 129 | isn't annoted (so it doesn't show up in the trace). However, it | 129 | isn't annotated (so it doesn't show up in the trace). However, it |
| 130 | calls "zoom" which is annotated so it is part of the call trace. | 130 | calls "zoom" which is annotated so it is part of the call trace. |
| 131 | Later, the method "windowWillUseStandardFrame" and the function | 131 | Later, the method "windowWillUseStandardFrame" and the function |
| 132 | "setFSValue" are called. The lines with "+---" contain extra | 132 | "setFSValue" are called. The lines with "+---" contain extra |
| @@ -230,7 +230,7 @@ void nstrace_leave(int *); | |||
| 230 | 230 | ||
| 231 | /* Function enter macros. | 231 | /* Function enter macros. |
| 232 | 232 | ||
| 233 | NSTRACE (fmt, ...) -- Enable trace output in curent block | 233 | NSTRACE (fmt, ...) -- Enable trace output in current block |
| 234 | (typically a function). Accepts printf-style | 234 | (typically a function). Accepts printf-style |
| 235 | arguments. | 235 | arguments. |
| 236 | 236 | ||
diff --git a/src/nsterm.m b/src/nsterm.m index fabfa2914a0..5e6c7484331 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -6353,7 +6353,7 @@ not_in_argv (NSString *arg) | |||
| 6353 | 6353 | ||
| 6354 | /* Restrict the new size to the text gird. | 6354 | /* Restrict the new size to the text gird. |
| 6355 | 6355 | ||
| 6356 | Don't restict the width if the user only adjusted the height, and | 6356 | Don't restrict the width if the user only adjusted the height, and |
| 6357 | vice versa. (Without this, the frame would shrink, and move | 6357 | vice versa. (Without this, the frame would shrink, and move |
| 6358 | slightly, if the window was resized by dragging one of its | 6358 | slightly, if the window was resized by dragging one of its |
| 6359 | borders.) */ | 6359 | borders.) */ |
| @@ -7591,7 +7591,7 @@ not_in_argv (NSString *arg) | |||
| 7591 | /* Constrain size and placement of a frame. | 7591 | /* Constrain size and placement of a frame. |
| 7592 | 7592 | ||
| 7593 | By returning the original "frameRect", the frame is not | 7593 | By returning the original "frameRect", the frame is not |
| 7594 | contrained. This can lead to unwanted situations where, for | 7594 | constrained. This can lead to unwanted situations where, for |
| 7595 | example, the menu bar covers the frame. | 7595 | example, the menu bar covers the frame. |
| 7596 | 7596 | ||
| 7597 | The default implementation (accessed using "super") constrains the | 7597 | The default implementation (accessed using "super") constrains the |
| @@ -7647,7 +7647,7 @@ not_in_argv (NSString *arg) | |||
| 7647 | 7647 | ||
| 7648 | #if 0 | 7648 | #if 0 |
| 7649 | // Native zoom done using the standard zoom animation. Size of the | 7649 | // Native zoom done using the standard zoom animation. Size of the |
| 7650 | // resulting frame reduced to accomodate the Dock and, if present, | 7650 | // resulting frame reduced to accommodate the Dock and, if present, |
| 7651 | // the menu-bar. | 7651 | // the menu-bar. |
| 7652 | [super zoom:sender]; | 7652 | [super zoom:sender]; |
| 7653 | 7653 | ||
| @@ -7661,8 +7661,8 @@ not_in_argv (NSString *arg) | |||
| 7661 | // | 7661 | // |
| 7662 | // This works for all practical purposes. (The only minor oddity is | 7662 | // This works for all practical purposes. (The only minor oddity is |
| 7663 | // when transiting from full-height frame to a maximized, the | 7663 | // when transiting from full-height frame to a maximized, the |
| 7664 | // animation reduces the height of the frame slighty (to the 4 | 7664 | // animation reduces the height of the frame slightly (to the 4 |
| 7665 | // pixels needed to accomodate the Doc) before it snaps back into | 7665 | // pixels needed to accommodate the Doc) before it snaps back into |
| 7666 | // full height. The user would need a very trained eye to spot | 7666 | // full height. The user would need a very trained eye to spot |
| 7667 | // this.) | 7667 | // this.) |
| 7668 | NSScreen * screen = [self screen]; | 7668 | NSScreen * screen = [self screen]; |
| @@ -7702,8 +7702,8 @@ not_in_argv (NSString *arg) | |||
| 7702 | } | 7702 | } |
| 7703 | } | 7703 | } |
| 7704 | #else | 7704 | #else |
| 7705 | // Non-native zoom which is done instantaneous. The resulting frame | 7705 | // Non-native zoom which is done instantaneously. The resulting frame |
| 7706 | // covert the entire scrren, except the menu-bar, if present. | 7706 | // covers the entire screen, except the menu-bar, if present. |
| 7707 | NSScreen * screen = [self screen]; | 7707 | NSScreen * screen = [self screen]; |
| 7708 | if (screen != nil) | 7708 | if (screen != nil) |
| 7709 | { | 7709 | { |
diff --git a/src/window.c b/src/window.c index 7c95ff9b16f..0ac76d41861 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -210,7 +210,7 @@ wset_update_mode_line (struct window *w) | |||
| 210 | { | 210 | { |
| 211 | /* If this window is the selected window on its frame, set the | 211 | /* If this window is the selected window on its frame, set the |
| 212 | global variable update_mode_lines, so that x_consider_frame_title | 212 | global variable update_mode_lines, so that x_consider_frame_title |
| 213 | will consider this frame's title for rtedisplay. */ | 213 | will consider this frame's title for redisplay. */ |
| 214 | Lisp_Object fselected_window = XFRAME (WINDOW_FRAME (w))->selected_window; | 214 | Lisp_Object fselected_window = XFRAME (WINDOW_FRAME (w))->selected_window; |
| 215 | 215 | ||
| 216 | if (WINDOWP (fselected_window) && XWINDOW (fselected_window) == w) | 216 | if (WINDOWP (fselected_window) && XWINDOW (fselected_window) == w) |