diff options
| author | Gerd Möllmann | 2025-01-23 15:38:26 +0100 |
|---|---|---|
| committer | Gerd Möllmann | 2025-01-23 15:38:26 +0100 |
| commit | 7c10518d169210b0aaf53035dff44923d7ee663c (patch) | |
| tree | 3f43b02edfe85fd659380bd3d22b756f44d70457 /src/dispnew.c | |
| parent | 24ee7217957c621c951d7d3956889aff74f74a7e (diff) | |
| parent | d83d090de1127d6e88e4ff33a617d8621a85a8cd (diff) | |
| download | emacs-scratch/se-matrix.tar.gz emacs-scratch/se-matrix.zip | |
Merge branch 'master' into scratch/se-matrixscratch/se-matrix
Diffstat (limited to 'src/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index a35ded7e567..93cf40b0203 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -3383,7 +3383,7 @@ rect_intersect (struct rect *r, struct rect r1, struct rect r2) | |||
| 3383 | 3383 | ||
| 3384 | /* Return the absolute position of frame F in *X and *Y. */ | 3384 | /* Return the absolute position of frame F in *X and *Y. */ |
| 3385 | 3385 | ||
| 3386 | static void | 3386 | void |
| 3387 | frame_pos_abs (struct frame *f, int *x, int *y) | 3387 | frame_pos_abs (struct frame *f, int *x, int *y) |
| 3388 | { | 3388 | { |
| 3389 | *x = *y = 0; | 3389 | *x = *y = 0; |
| @@ -3423,7 +3423,7 @@ max_child_z_order (struct frame *parent) | |||
| 3423 | 3423 | ||
| 3424 | /* Return true if F1 is an ancestor of F2. */ | 3424 | /* Return true if F1 is an ancestor of F2. */ |
| 3425 | 3425 | ||
| 3426 | static bool | 3426 | bool |
| 3427 | is_frame_ancestor (struct frame *f1, struct frame *f2) | 3427 | is_frame_ancestor (struct frame *f1, struct frame *f2) |
| 3428 | { | 3428 | { |
| 3429 | for (struct frame *f = FRAME_PARENT_FRAME (f2); f; f = FRAME_PARENT_FRAME (f)) | 3429 | for (struct frame *f = FRAME_PARENT_FRAME (f2); f; f = FRAME_PARENT_FRAME (f)) |