[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master de3fa65 15/21: Merge from origin/emacs-25
From: |
John Wiegley |
Subject: |
[Emacs-diffs] master de3fa65 15/21: Merge from origin/emacs-25 |
Date: |
Fri, 04 Mar 2016 08:08:23 +0000 |
branch: master
commit de3fa655de8a1f9a1e23ed67ec70700ab8f5a591
Merge: eab3f9e cb1e3da
Author: John Wiegley <address@hidden>
Commit: John Wiegley <address@hidden>
Merge from origin/emacs-25
cb1e3da Also allow setting the paragraph direction to nil
bbe8a89 Made the new OS X visible bell more visible.
---
lisp/net/eww.el | 16 +++++++++++-----
src/nsterm.m | 5 ++++-
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index d37b1b3..34cb02c 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.
diff --git a/src/nsterm.m b/src/nsterm.m
index 43d1377..185753d 100644
--- 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;
- [Emacs-diffs] master fd4fc00 03/21: Merge from origin/emacs-25, (continued)
- [Emacs-diffs] master fd4fc00 03/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 5ab243f 12/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master b50a207 10/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master f991a50 11/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 692caf1 09/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 68ce800 13/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master eab3f9e 14/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 4df043c 16/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 5be4e9d 19/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 9fb9d07 17/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master de3fa65 15/21: Merge from origin/emacs-25,
John Wiegley <=
- [Emacs-diffs] master c69aef1 18/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 5c6cc95 20/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 17982e0 21/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04