mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-25

Browse source 
cb1e3da Also allow setting the paragraph direction to nil
bbe8a89 Made the new OS X visible bell more visible.
This commit is contained in:
John Wiegley 2016-03-03 23:53:27 -08:00
commit de3fa655de
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lisp/net/eww.el
View file

@ -618,13 +618,19 @@ Currently this means either text/html or application/xhtml+xml."
(view-buffer buf)))
(defun eww-toggle-paragraph-direction ()
"Toggle the paragraphs direction between left-to-right and right-to-left."
"Cycle the paragraph direction between left-to-right, right-to-left and auto."
(interactive)
(setq bidi-paragraph-direction
(if (eq bidi-paragraph-direction 'left-to-right)
'right-to-left
'left-to-right))
(message "The paragraph direction is now %s" bidi-paragraph-direction))
(cond ((eq bidi-paragraph-direction 'left-to-right)
nil)
((eq bidi-paragraph-direction 'right-to-left)
'left-to-right)
(t
'right-to-left)))
(message "The paragraph direction is now %s"
(if (null bidi-paragraph-direction)
"automatic"
bidi-paragraph-direction)))
(defun eww-readable ()
"View the main \"readable\" parts of the current web page.

5
src/nsterm.m
View file

@ -1197,13 +1197,16 @@ ns_clip_to_row (struct window *w, struct glyph_row *row,
// 2011, see https://savannah.gnu.org/bugs/?33396
//
// As a drop in replacement, a semitransparent gray square is used.
self.image = [[NSImage alloc] initWithSize:NSMakeSize(32, 32)];
self.image = [[NSImage alloc] initWithSize:NSMakeSize(32 * 5, 32 * 5)];
[self.image lockFocus];
[[NSColor colorForEmacsRed:0.5 green:0.5 blue:0.5 alpha:0.5] set];
NSRectFill(NSMakeRect(0, 0, 32, 32));
[self.image unlockFocus];
#else
self.image = [NSImage imageNamed:NSImageNameCaution];
[self.image setScalesWhenResized:YES];
[self.image setSize:NSMakeSize(self.image.size.width * 5,
self.image.size.height * 5)];
#endif
}
return self;