[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/gnus-select 7d929e5 098/218: Another followup to f
From: |
Andrew G Cohen |
Subject: |
[Emacs-diffs] feature/gnus-select 7d929e5 098/218: Another followup to fixing 'window-text-pixel-width' |
Date: |
Fri, 14 Dec 2018 03:35:09 -0500 (EST) |
branch: feature/gnus-select
commit 7d929e5cb93166b0c2f095cff54df6c7ee1fe3c9
Author: Eli Zaretskii <address@hidden>
Commit: Andrew G Cohen <address@hidden>
Another followup to fixing 'window-text-pixel-width'
* src/xdisp.c (Fwindow_text_pixel_size): Adjust the return value
when we stop one buffer position short of TO. (Bug#30746)
---
src/xdisp.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index b99990d..424f173 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10173,9 +10173,14 @@ include the height of both, if present, in the return
value. */)
RESTORE_IT (&it, &it2, it2data);
x = move_it_to (&it, end, to_x, max_y, -1, move_op);
/* Add the width of the thing at TO, but only if we didn't
- overshoot it; if we did, it is already accounted for. */
+ overshoot it; if we did, it is already accounted for. Also,
+ account for the height of the thing at TO. */
if (IT_CHARPOS (it) == end)
- x += it.pixel_width;
+ {
+ x += it.pixel_width;
+ it.max_ascent = max (it.max_ascent, it.ascent);
+ it.max_descent = max (it.max_descent, it.descent);
+ }
}
if (!NILP (x_limit))
{
- [Emacs-diffs] feature/gnus-select 8912ca0 211/218: Make eshell/kill handle -<signal> and -<SIGNALNAME> (Bug#29156), (continued)
- [Emacs-diffs] feature/gnus-select 8912ca0 211/218: Make eshell/kill handle -<signal> and -<SIGNALNAME> (Bug#29156), Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 4b68a75 216/218: ; Spelling fix, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 2e4c1b9 196/218: Replace some uses of cl with cl-lib, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 709e1da 189/218: Fix bug#30846, along with misc cleanups found along the way, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 8ee4b77 194/218: cedet: replace cl with cl-lib, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 5b0fed9 218/218: Fix constant folding of overflows, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 1955afe 162/218: * lisp/gnus/gnus-cloud.el (gnus-cloud-synced-files): Fix doc & type., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 36a0cfe 150/218: Improve documentation of Auto-Revert mode, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 73ee8d2 181/218: * doc/lispref/buffers.texi (Buffer List): Fix grammar., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 233bfb5 209/218: Fix byte-optimize-memq incorrectly optimizing some memq forms., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 7d929e5 098/218: Another followup to fixing 'window-text-pixel-width',
Andrew G Cohen <=
- [Emacs-diffs] feature/gnus-select c5d9d8b 101/218: Quieten semantic re-compilation when .elc already exist, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 3a01434 108/218: * lisp/emacs-lisp/ert.el (ert-run-tests-batch): Print selector., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 43af089 113/218: * lisp/url/url-handlers.el: No need for subr-x at run-time., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 9e3f6aa 104/218: Explicitly require cl-lib where needed, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 1d789ec 117/218: Allow 'browse-url-emacs' to fetch URL in the selected window, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 9c19d2d 116/218: Fix typo in the Emacs manual's VC chapter, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select d448a99 124/218: ; Spelling fix, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 31b6fa0 115/218: Various follow-ups for early init file changes, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select d5087f9 131/218: ; * test/lisp/info-xref-tests.el: Remove stray line from previous., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 44c15fe 133/218: ; Spelling fix, Andrew G Cohen, 2018/12/14