diff options
| author | Andrea Corallo | 2020-08-09 15:03:23 +0200 |
|---|---|---|
| committer | Andrea Corallo | 2020-08-09 15:03:23 +0200 |
| commit | 12a982d9789052d8e85efcacb4b311f4876c882a (patch) | |
| tree | a452a8e888c6ee9c85d6a487359b7a1c0c9fa15b /src/fringe.c | |
| parent | 80d7f710f2fab902e46aa3fddb8e1c1795420af3 (diff) | |
| parent | 8e82baf5a730ff542118ddba5b76afdc1db643f6 (diff) | |
| download | emacs-12a982d9789052d8e85efcacb4b311f4876c882a.tar.gz emacs-12a982d9789052d8e85efcacb4b311f4876c882a.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/fringe.c')
| -rw-r--r-- | src/fringe.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/fringe.c b/src/fringe.c index fc4c738dc2d..c3d64fefc82 100644 --- a/src/fringe.c +++ b/src/fringe.c | |||
| @@ -23,7 +23,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 23 | 23 | ||
| 24 | #include "lisp.h" | 24 | #include "lisp.h" |
| 25 | #include "frame.h" | 25 | #include "frame.h" |
| 26 | #include "ptr-bounds.h" | ||
| 27 | #include "window.h" | 26 | #include "window.h" |
| 28 | #include "dispextern.h" | 27 | #include "dispextern.h" |
| 29 | #include "buffer.h" | 28 | #include "buffer.h" |
| @@ -1607,9 +1606,7 @@ If BITMAP already exists, the existing definition is replaced. */) | |||
| 1607 | fb.dynamic = true; | 1606 | fb.dynamic = true; |
| 1608 | 1607 | ||
| 1609 | xfb = xmalloc (sizeof fb + fb.height * BYTES_PER_BITMAP_ROW); | 1608 | xfb = xmalloc (sizeof fb + fb.height * BYTES_PER_BITMAP_ROW); |
| 1610 | fb.bits = b = ((unsigned short *) | 1609 | fb.bits = b = (unsigned short *) (xfb + 1); |
| 1611 | ptr_bounds_clip (xfb + 1, fb.height * BYTES_PER_BITMAP_ROW)); | ||
| 1612 | xfb = ptr_bounds_clip (xfb, sizeof *xfb); | ||
| 1613 | 1610 | ||
| 1614 | j = 0; | 1611 | j = 0; |
| 1615 | while (j < fb.height) | 1612 | while (j < fb.height) |