diff options
| author | Charles A. Roelli | 2018-08-08 21:26:33 +0200 |
|---|---|---|
| committer | Charles A. Roelli | 2018-08-08 21:26:33 +0200 |
| commit | 7eef590870a35008d55a04efcd76780b7668c3ec (patch) | |
| tree | c29dfa8e7084e4016012ec589e0d2b8343e2c3ff | |
| parent | 5025fb617d19f08d907e89697616d4dfd912baa5 (diff) | |
| download | emacs-7eef590870a35008d55a04efcd76780b7668c3ec.tar.gz emacs-7eef590870a35008d55a04efcd76780b7668c3ec.zip | |
; Fix typos in commentary
* src/xdisp.c (windows_or_buffers_changed, update_mode_lines)
(get_phys_cursor_geometry, display_echo_area_1)
(resize_mini_window_1):
* src/dispextern.h (struct it): Fix typos in commentary.
| -rw-r--r-- | src/dispextern.h | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 2180c9ae63f..0822d71213b 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -2482,7 +2482,7 @@ struct it | |||
| 2482 | 2482 | ||
| 2483 | If `what' is anything else, these two are undefined (will | 2483 | If `what' is anything else, these two are undefined (will |
| 2484 | probably hold values for the last IT_CHARACTER or IT_COMPOSITION | 2484 | probably hold values for the last IT_CHARACTER or IT_COMPOSITION |
| 2485 | traversed by the iterator. | 2485 | traversed by the iterator). |
| 2486 | 2486 | ||
| 2487 | The values are updated by get_next_display_element, so they are | 2487 | The values are updated by get_next_display_element, so they are |
| 2488 | out of sync with the value returned by IT_CHARPOS between the | 2488 | out of sync with the value returned by IT_CHARPOS between the |
diff --git a/src/xdisp.c b/src/xdisp.c index 8f89ec559ad..956535c2dba 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -467,12 +467,12 @@ static bool message_enable_multibyte; | |||
| 467 | looking for those `redisplay' bits (actually, there might be some such bits | 467 | looking for those `redisplay' bits (actually, there might be some such bits |
| 468 | set, but then only on objects which aren't displayed anyway). | 468 | set, but then only on objects which aren't displayed anyway). |
| 469 | 469 | ||
| 470 | OTOH if it's non-zero we wil have to loop through all windows and then check | 470 | OTOH if it's non-zero we will have to loop through all windows and then |
| 471 | the `redisplay' bit of the corresponding window, frame, and buffer, in order | 471 | check the `redisplay' bit of the corresponding window, frame, and buffer, in |
| 472 | to decide whether that window needs attention or not. Note that we can't | 472 | order to decide whether that window needs attention or not. Note that we |
| 473 | just look at the frame's redisplay bit to decide that the whole frame can be | 473 | can't just look at the frame's redisplay bit to decide that the whole frame |
| 474 | skipped, since even if the frame's redisplay bit is unset, some of its | 474 | can be skipped, since even if the frame's redisplay bit is unset, some of |
| 475 | windows's redisplay bits may be set. | 475 | its windows's redisplay bits may be set. |
| 476 | 476 | ||
| 477 | Mostly for historical reasons, windows_or_buffers_changed can also take | 477 | Mostly for historical reasons, windows_or_buffers_changed can also take |
| 478 | other non-zero values. In that case, the precise value doesn't matter (it | 478 | other non-zero values. In that case, the precise value doesn't matter (it |
| @@ -483,7 +483,7 @@ static bool message_enable_multibyte; | |||
| 483 | int windows_or_buffers_changed; | 483 | int windows_or_buffers_changed; |
| 484 | 484 | ||
| 485 | /* Nonzero if we should redraw the mode lines on the next redisplay. | 485 | /* Nonzero if we should redraw the mode lines on the next redisplay. |
| 486 | Similarly to `windows_or_buffers_changed', If it has value REDISPLAY_SOME, | 486 | Similarly to `windows_or_buffers_changed', if it has value REDISPLAY_SOME, |
| 487 | then only redisplay the mode lines in those buffers/windows/frames where the | 487 | then only redisplay the mode lines in those buffers/windows/frames where the |
| 488 | `redisplay' bit has been set. | 488 | `redisplay' bit has been set. |
| 489 | For any other value, redisplay all mode lines (the number used is then only | 489 | For any other value, redisplay all mode lines (the number used is then only |
| @@ -2281,9 +2281,9 @@ get_phys_cursor_geometry (struct window *w, struct glyph_row *row, | |||
| 2281 | int x, y, wd, h, h0, y0, ascent; | 2281 | int x, y, wd, h, h0, y0, ascent; |
| 2282 | 2282 | ||
| 2283 | /* Compute the width of the rectangle to draw. If on a stretch | 2283 | /* Compute the width of the rectangle to draw. If on a stretch |
| 2284 | glyph, and `x-stretch-block-cursor' is nil, don't draw a | 2284 | glyph, and `x-stretch-cursor' is nil, don't draw a rectangle |
| 2285 | rectangle as wide as the glyph, but use a canonical character | 2285 | as wide as the glyph, but use a canonical character width |
| 2286 | width instead. */ | 2286 | instead. */ |
| 2287 | wd = glyph->pixel_width; | 2287 | wd = glyph->pixel_width; |
| 2288 | 2288 | ||
| 2289 | x = w->phys_cursor.x; | 2289 | x = w->phys_cursor.x; |
| @@ -11148,7 +11148,7 @@ display_echo_area (struct window *w) | |||
| 11148 | 11148 | ||
| 11149 | /* Helper for display_echo_area. Display the current buffer which | 11149 | /* Helper for display_echo_area. Display the current buffer which |
| 11150 | contains the current echo area message in window W, a mini-window, | 11150 | contains the current echo area message in window W, a mini-window, |
| 11151 | a pointer to which is passed in A1. A2..A4 are currently not used. | 11151 | a pointer to which is passed in A1. A2 is currently not used. |
| 11152 | Change the height of W so that all of the message is displayed. | 11152 | Change the height of W so that all of the message is displayed. |
| 11153 | Value is true if height of W was changed. */ | 11153 | Value is true if height of W was changed. */ |
| 11154 | 11154 | ||
| @@ -11209,8 +11209,8 @@ resize_echo_area_exactly (void) | |||
| 11209 | /* Callback function for with_echo_area_buffer, when used from | 11209 | /* Callback function for with_echo_area_buffer, when used from |
| 11210 | resize_echo_area_exactly. A1 contains a pointer to the window to | 11210 | resize_echo_area_exactly. A1 contains a pointer to the window to |
| 11211 | resize, EXACTLY non-nil means resize the mini-window exactly to the | 11211 | resize, EXACTLY non-nil means resize the mini-window exactly to the |
| 11212 | size of the text displayed. A3 and A4 are not used. Value is what | 11212 | size of the text displayed. Value is what resize_mini_window |
| 11213 | resize_mini_window returns. */ | 11213 | returns. */ |
| 11214 | 11214 | ||
| 11215 | static bool | 11215 | static bool |
| 11216 | resize_mini_window_1 (ptrdiff_t a1, Lisp_Object exactly) | 11216 | resize_mini_window_1 (ptrdiff_t a1, Lisp_Object exactly) |