summaryrefslogtreecommitdiff
path: root/src/nsterm.m
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-12-30 16:57:36 -0800
committerGlenn Morris <rgm@gnu.org>2018-12-30 16:57:36 -0800
commita8e545ef6b92f6eb5916a6803a5d95256fd9eb6b (patch)
tree38752101a9dcceb10009f017bced8e0a213e21ed /src/nsterm.m
parent83bbb48142e5f9714408dd628d244678eff2dc11 (diff)
parent3abebeb8c3047092763f2d4a61fe7dfc659cd1bf (diff)
downloademacs-a8e545ef6b92f6eb5916a6803a5d95256fd9eb6b.tar.gz
Merge from origin/emacs-26
3abebeb * lisp/files.el (cd): Fix last change. (Bug#33791) 7a60a4f Fix remote directories in Eshell on MS-Windows 822a2d0 Fix :type 'group' in defcustom a731c56 Fix NS fringe bitmap drawing bug (bug#33864) 0c52459 Fix commentary in dispnew.c c9fdd1b Improve accept-process-process doc 9578c2a Fix a simple bug in display-buffer-use-some-frame 0f9be72 Clarify thread switching while waiting for process output 24ddea0 Improve process doc. with respect to handling of large input ... 2931016 ; Cosmetic changes in etc/NEWS 85516b8 Minor copyedits in landmark.el # Conflicts: # etc/NEWS
Diffstat (limited to 'src/nsterm.m')
-rw-r--r--src/nsterm.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsterm.m b/src/nsterm.m
index 6c285f0abb7..a624f628175 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3062,7 +3062,7 @@ ns_draw_fringe_bitmap (struct window *w, struct glyph_row *row,
/* Work out the rectangle we will need to clear. Because we're
compositing rather than blitting, we need to clear the area under
the image regardless of anything else. */
- if (!p->overlay_p)
+ if (p->bx >= 0 && !p->overlay_p)
{
clearRect = NSMakeRect (p->bx, p->by, p->nx, p->ny);
clearRect = NSUnionRect (clearRect, imageRect);