diff options
| author | Gregory Heytings <gregory@heytings.org> | 2022-07-08 21:22:52 +0000 |
|---|---|---|
| committer | Gregory Heytings <gregory@heytings.org> | 2022-07-08 23:36:58 +0200 |
| commit | 1792cbaddc33772c344e45fb9478bee85fee66e7 (patch) | |
| tree | 6bc87aa85e8c14091ef00433a52d28b99d9d0d32 /src/composite.c | |
| parent | 60e51595c8a89ffc34dbe0d36c75d1c119a7d5c5 (diff) | |
| download | emacs-1792cbaddc33772c344e45fb9478bee85fee66e7.tar.gz emacs-1792cbaddc33772c344e45fb9478bee85fee66e7.tar.bz2 emacs-1792cbaddc33772c344e45fb9478bee85fee66e7.zip | |
Actually fix the long lines display bug (bug#56393).
* src/dispextern.h (struct it): New 'narrowed_begv' field.
* src/dispextern.h (WITH_NARROWED_BEGV): New macro.
* src/xdisp.c (get_narrowed_begv): New function.
(init_iterator): Initilize the 'narrowed_begv' field.
(back_to_previous_line_start, get_visually_first_element,
move_it_vertically_backward): Use the new macro.
* src/dispextern.h: Prototype of 'get_narrowed_begv'.
* src/window.c (window_body_height): Make it externally visible.
* src/window.h: Prototype of 'window_body_height'.
* src/composite.c (find_automatic_composition): Optimize display in buffers
with very long lines with 'get_narrowed_begv'.
* lisp/obsolete/longlines.el: Reobsolete longlines-mode.
* etc/NEWS: Announce the new minor mode, and remove the unobsoletion
indication for 'longlines-mode'.
* doc/emacs/trouble.texi (Long Lines): Remove the section.
(Lossage): Remove the entry for the Long Lines section.
* doc/emacs/emacs.texi (Top): Remove the entry for the Long Lines section.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/composite.c b/src/composite.c index 4d69702171f..d8998b5a1f3 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1576,6 +1576,7 @@ find_automatic_composition (ptrdiff_t pos, ptrdiff_t limit, ptrdiff_t backlim, Lisp_Object window; struct window *w; bool need_adjustment = 0; + ptrdiff_t narrowed_begv; window = Fget_buffer_window (Fcurrent_buffer (), Qnil); if (NILP (window)) @@ -1586,6 +1587,11 @@ find_automatic_composition (ptrdiff_t pos, ptrdiff_t limit, ptrdiff_t backlim, if (NILP (string)) { head = backlim < 0 ? BEGV : backlim, tail = ZV, stop = GPT; + /* In buffers with very long lines, this function becomes very + slow. Pretend that the buffer is narrowed to make it fast. */ + narrowed_begv = get_narrowed_begv (w); + if (pos > narrowed_begv) + head = narrowed_begv; cur.pos_byte = CHAR_TO_BYTE (cur.pos); cur.p = BYTE_POS_ADDR (cur.pos_byte); } |