diff options
| author | John Wiegley | 2016-03-03 23:53:27 -0800 |
|---|---|---|
| committer | John Wiegley | 2016-03-03 23:53:27 -0800 |
| commit | de3fa655de8a1f9a1e23ed67ec70700ab8f5a591 (patch) | |
| tree | c72faea21b08f038064aa6ac642083d40d1d862a /src | |
| parent | eab3f9e76b8188b5f99139b220a272fe3f2debaf (diff) | |
| parent | cb1e3da12eb1fcacbf9933ca49a85b6f4116878c (diff) | |
| download | emacs-de3fa655de8a1f9a1e23ed67ec70700ab8f5a591.tar.gz emacs-de3fa655de8a1f9a1e23ed67ec70700ab8f5a591.zip | |
Merge from origin/emacs-25
cb1e3da Also allow setting the paragraph direction to nil
bbe8a89 Made the new OS X visible bell more visible.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 43d1377f8a7..185753d8f2b 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -1197,13 +1197,16 @@ ns_clip_to_row (struct window *w, struct glyph_row *row, | |||
| 1197 | // 2011, see https://savannah.gnu.org/bugs/?33396 | 1197 | // 2011, see https://savannah.gnu.org/bugs/?33396 |
| 1198 | // | 1198 | // |
| 1199 | // As a drop in replacement, a semitransparent gray square is used. | 1199 | // As a drop in replacement, a semitransparent gray square is used. |
| 1200 | self.image = [[NSImage alloc] initWithSize:NSMakeSize(32, 32)]; | 1200 | self.image = [[NSImage alloc] initWithSize:NSMakeSize(32 * 5, 32 * 5)]; |
| 1201 | [self.image lockFocus]; | 1201 | [self.image lockFocus]; |
| 1202 | [[NSColor colorForEmacsRed:0.5 green:0.5 blue:0.5 alpha:0.5] set]; | 1202 | [[NSColor colorForEmacsRed:0.5 green:0.5 blue:0.5 alpha:0.5] set]; |
| 1203 | NSRectFill(NSMakeRect(0, 0, 32, 32)); | 1203 | NSRectFill(NSMakeRect(0, 0, 32, 32)); |
| 1204 | [self.image unlockFocus]; | 1204 | [self.image unlockFocus]; |
| 1205 | #else | 1205 | #else |
| 1206 | self.image = [NSImage imageNamed:NSImageNameCaution]; | 1206 | self.image = [NSImage imageNamed:NSImageNameCaution]; |
| 1207 | [self.image setScalesWhenResized:YES]; | ||
| 1208 | [self.image setSize:NSMakeSize(self.image.size.width * 5, | ||
| 1209 | self.image.size.height * 5)]; | ||
| 1207 | #endif | 1210 | #endif |
| 1208 | } | 1211 | } |
| 1209 | return self; | 1212 | return self; |