Merge from origin/emacs-25

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

1 files changed, 11 insertions, 5 deletions

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index d37b1b3261b..34cb02c24ac 100644
--- 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.