procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename two long line optimizations variables

Browse source 
* src/buffer.c (syms_of_buffer): Rename two variables.

* src/xdisp.c (get_locked_narrowing_begv):
(get_locked_narrowing_zv):
(handle_fontified_prop): Use the new names.

* src/keyboard.c (safe_run_hooks_maybe_narrowed): Use the new
names.
This commit is contained in:
Gregory Heytings 2023-02-09 01:09:10 +00:00
parent 0d73e4aa26
commit a6cd4553d4
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/buffer.c
View file

@ -5916,8 +5916,8 @@ If nil, these display shortcuts will always remain disabled.
There is no reason to change that value except for debugging purposes. */); There is no reason to change that value except for debugging purposes. */);
XSETFASTINT (Vlong_line_threshold, 50000); XSETFASTINT (Vlong_line_threshold, 50000);
DEFVAR_INT ("long-line-locked-narrowing-region-size", DEFVAR_INT ("long-line-optimizations-region-size",
long_line_locked_narrowing_region_size, long_line_optimizations_region_size,
doc: /* Region size for locked narrowing in buffers with long lines. doc: /* Region size for locked narrowing in buffers with long lines.
This variable has effect only in buffers which contain one or more This variable has effect only in buffers which contain one or more
@ -5932,10 +5932,10 @@ To disable that narrowing, set this variable to 0.
See also `long-line-locked-narrowing-bol-search-limit'. See also `long-line-locked-narrowing-bol-search-limit'.
There is no reason to change that value except for debugging purposes. */); There is no reason to change that value except for debugging purposes. */);
long_line_locked_narrowing_region_size = 500000; long_line_optimizations_region_size = 500000;
DEFVAR_INT ("long-line-locked-narrowing-bol-search-limit", DEFVAR_INT ("long-line-optimizations-bol-search-limit",
long_line_locked_narrowing_bol_search_limit, long_line_optimizations_bol_search_limit,
doc: /* Limit for beginning of line search in buffers with long lines. doc: /* Limit for beginning of line search in buffers with long lines.
This variable has effect only in buffers which contain one or more This variable has effect only in buffers which contain one or more
@ -5949,7 +5949,7 @@ small integer, specifies the number of characters by which that region
can be extended backwards to make it start at the beginning of a line. can be extended backwards to make it start at the beginning of a line.
There is no reason to change that value except for debugging purposes. */); There is no reason to change that value except for debugging purposes. */);
long_line_locked_narrowing_bol_search_limit = 128; long_line_optimizations_bol_search_limit = 128;
DEFVAR_INT ("large-hscroll-threshold", large_hscroll_threshold, DEFVAR_INT ("large-hscroll-threshold", large_hscroll_threshold,
doc: /* Horizontal scroll of truncated lines above which to use redisplay shortcuts. doc: /* Horizontal scroll of truncated lines above which to use redisplay shortcuts.

2
src/keyboard.c
View file

@ -1910,7 +1910,7 @@ safe_run_hooks_maybe_narrowed (Lisp_Object hook, struct window *w)
specbind (Qinhibit_quit, Qt); specbind (Qinhibit_quit, Qt);
if (current_buffer->long_line_optimizations_p if (current_buffer->long_line_optimizations_p
&& long_line_locked_narrowing_region_size > 0) && long_line_optimizations_region_size > 0)
{ {
ptrdiff_t begv = get_locked_narrowing_begv (PT); ptrdiff_t begv = get_locked_narrowing_begv (PT);
ptrdiff_t zv = get_locked_narrowing_zv (PT); ptrdiff_t zv = get_locked_narrowing_zv (PT);

12
src/xdisp.c
View file

@ -3536,11 +3536,11 @@ get_closer_narrowed_begv (struct window *w, ptrdiff_t pos)
ptrdiff_t ptrdiff_t
get_locked_narrowing_begv (ptrdiff_t pos) get_locked_narrowing_begv (ptrdiff_t pos)
{ {
if (long_line_locked_narrowing_region_size <= 0) if (long_line_optimizations_region_size <= 0)
return BEGV; return BEGV;
int len = long_line_locked_narrowing_region_size / 2; int len = long_line_optimizations_region_size / 2;
int begv = max (pos - len, BEGV); int begv = max (pos - len, BEGV);
int limit = long_line_locked_narrowing_bol_search_limit; int limit = long_line_optimizations_bol_search_limit;
while (limit > 0) while (limit > 0)
{ {
if (begv == BEGV || FETCH_BYTE (CHAR_TO_BYTE (begv) - 1) == '\n') if (begv == BEGV || FETCH_BYTE (CHAR_TO_BYTE (begv) - 1) == '\n')
@ -3554,9 +3554,9 @@ get_locked_narrowing_begv (ptrdiff_t pos)
ptrdiff_t ptrdiff_t
get_locked_narrowing_zv (ptrdiff_t pos) get_locked_narrowing_zv (ptrdiff_t pos)
{ {
if (long_line_locked_narrowing_region_size <= 0) if (long_line_optimizations_region_size <= 0)
return ZV; return ZV;
int len = long_line_locked_narrowing_region_size / 2; int len = long_line_optimizations_region_size / 2;
return min (pos + len, ZV); return min (pos + len, ZV);
} }
@ -4394,7 +4394,7 @@ handle_fontified_prop (struct it *it)
eassert (it->end_charpos == ZV); eassert (it->end_charpos == ZV);
if (current_buffer->long_line_optimizations_p if (current_buffer->long_line_optimizations_p
&& long_line_locked_narrowing_region_size > 0) && long_line_optimizations_region_size > 0)
{ {
ptrdiff_t begv = it->locked_narrowing_begv; ptrdiff_t begv = it->locked_narrowing_begv;
ptrdiff_t zv = it->locked_narrowing_zv; ptrdiff_t zv = it->locked_narrowing_zv;