Merge from origin/emacs-25

cb1e3da Also allow setting the paragraph direction to nil
bbe8a89 Made the new OS X visible bell more visible.

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index d37b1b3261bb6c2a6f3b7cd654cb7befe29bcad8..34cb02c24ac16851796f62f3834f6c07c03d0e66 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -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.

diff --git a/src/nsterm.m b/src/nsterm.m
index 43d1377f8a717cf6b9be8661fb2acb5d4cbb693a..185753d8f2b77cfce5a1c334548773b9ec73be43 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -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;