[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/gnus-select b405149 072/218: * src/xdisp.c (Fwindo
From: |
Andrew G Cohen |
Subject: |
[Emacs-diffs] feature/gnus-select b405149 072/218: * src/xdisp.c (Fwindow_text_pixel_size): Fix last change. |
Date: |
Fri, 14 Dec 2018 03:35:02 -0500 (EST) |
branch: feature/gnus-select
commit b40514995cf1f5fcd6cbf344cbbc648f366173bf
Author: Eli Zaretskii <address@hidden>
Commit: Andrew G Cohen <address@hidden>
* src/xdisp.c (Fwindow_text_pixel_size): Fix last change.
---
src/xdisp.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index d552871..c0fdeca 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10143,14 +10143,12 @@ include the height of both, if present, in the return
value. */)
directionality, and regions that begin and end in text of the
same directionality. */
it.bidi_p = false;
- void *it2data = NULL;
- struct it it2;
- SAVE_IT (it2, it, it2data);
int move_op = MOVE_TO_POS | MOVE_TO_Y;
int to_x = -1;
if (!NILP (x_limit))
{
+ it.last_visible_x = max_x;
/* Actually, we never want move_it_to stop at to_x. But to make
sure that move_it_in_display_line_to always moves far enough,
we set to_x to INT_MAX and specify MOVE_TO_X. */
@@ -10158,6 +10156,10 @@ include the height of both, if present, in the return
value. */)
to_x = INT_MAX;
}
+ void *it2data = NULL;
+ struct it it2;
+ SAVE_IT (it2, it, it2data);
+
x = move_it_to (&it, end, to_x, max_y, -1, move_op);
/* We could have a display property at END, in which case asking
- [Emacs-diffs] feature/gnus-select fbe22b5 014/218: Replace some obsolete aliases in code, (continued)
- [Emacs-diffs] feature/gnus-select fbe22b5 014/218: Replace some obsolete aliases in code, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 46738e3 040/218: Improve SVG documentation, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select d25b161 042/218: Fix wrong behavior of 'outline-headers-as-kill' command (Bug#30209), Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 064037f 050/218: * lisp/simple.el (mark-whole-buffer): Clarify its behavior., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 906b8fb 048/218: Port to NetBSD tzalloc, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select fd1f96f 060/218: Replace use of the obsolete write-contents-hooks, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 7f35e7d 055/218: Improve documentation of Xref, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 2fe4ae7 057/218: Fix last change in Xref documentation, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select b92cf09 065/218: Stop mentioning options.el in doc, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 2005a72 069/218: Avoid assertion violation under visual-order-cursor-movement, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select b405149 072/218: * src/xdisp.c (Fwindow_text_pixel_size): Fix last change.,
Andrew G Cohen <=
- [Emacs-diffs] feature/gnus-select ea586a7 081/218: Fix problems caused by fontconfig-2.13.0, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 3b92c80 068/218: * lisp/subr.el (focus-frame, unfocus-frame): Remove obsolete no-ops., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 64c4ec0 082/218: More hydra.nixos.org logging for unfinished tests, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 066e71d 056/218: More changes in the Emacs manual, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 212e217 064/218: * lisp/loadhist.el (unload-hook-features-list): Remove obsolete alias., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 88a19e4 080/218: * lisp/desktop.el: Make use some "new" functionality, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select d27fdc5 085/218: Fix an error in tramp-archive-test42-auto-load, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select e3338f2 078/218: Extend ert to print duration of single tests, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 7928693 020/218: Fix 'window-text-pixel-size' when display properties are around, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 850e683 023/218: ; Tiny fix for recent doc change, Andrew G Cohen, 2018/12/14