Merge from origin/emacs-29

7678b7e46f2 Eglot: check server capability before sending didSave (bu... a3a1ef7bd5e Fix rust-ts-mode type and module highlighting (Bug#61302) 477aa047ee7 rust-ts-mode: Highlight variable reassignments 5206a551c16 Improve backward compatibility of save-restriction accd88d5545 Don't indent template_string contents (bug#61503) d97a3839967 csharp-ts-mode: fontify compiler directives (bug#61512) 420d2cae846 Update to Transient v0.3.7-209-gdab1dfa a3751b5d0c1 ; Raise an error if a VC package checkout is empty 6a32ba8b69c ; Fix the installation of dependencies for VC packages 4eac80fcc39 ; Prepare to update ERC version to 5.5 4f099a72173 ; Remove failing erc-reuse-buffers test 4bb27a5ca93 ; Minor docs copyedits 13bcff3da5c Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/... 3d572ae0d50 Rename with/without-narrowing to with/without-restriction d806b0e33cf * lisp/repeat.el: Rename internal function and variable (... dd8b720ee74 ; * etc/NEWS: Fix typos. 909bd04cf5f ; * lisp/calendar/lunar.el: Add comments. (bug#61460) 10f2aedea9a ; * lisp/progmodes/c-ts-mode.el (c-ts-base-mode): delete ... 865758130a1 ; * admin/git-bisect-start: Update failing commits b948d0d7efe Merge branch 'scratch/fix-locked-narrowing' dcb2379a463 Minor improvements to labeled narrowing cc30422825a Fix spurious display of eclipses in Calendar f2114e8d89f Fix indentation for closing bracket in c-ts-mode (bug#61398) f49caaa8925 ; * src/pdumper.c (dump_buffer): Update hash. fe2ea5ddd8d Update to Org 9.6.1-31-gaf1bb1 8280d721d7c * src/.gdbinit (nextcons): Amend $.u.cdr to $.u.s.u.cdr (... eb2b0931cf1 Add lambda_expression to c-ts-common-indent-type-regexp-a... 2da05876edb ; Use the right name when specifying VC packages d4fc7012978 Tolerate missing elpa-packages.eld files 8bc1b7d0b27 Avoid warning about 'load-path' in non-interactive sessions 3d17aee13d9 ; Fix installation of dependencies for VC packages 86ca7df6a34 ; Mention Hunspell private-dictionary misfeature in doc s... 7287b7b53a1 Support webkit2gtk-4.1 048a2dabfc4 ; Fix typo 8f3091defb3 ; Fix typo in buffer.h 4da398d8b57 ; Fix typos 074008ee2d2 ; Fix doc strings in lisp/image/ directory 2d1e43436da ; Improve documentation of hash functions. 900f7e07275 ; Remove extraneous local variables from image-dired-*.el... 4297039bd13 Save and restore the absence of narrowing locks 4f053afe8e7 bug-reference: prevent match-data clobbering (bug#61395) 10af9fbcad1 ; * admin/notes/tree-sitter/starter-guide: Typos. 9ac242ce93d ; Fix recent changes in treesit docs f5789aefc2e Rename LIMIT to DEPTH in tree-sitter functions (bug#61231) b39821fdcef ; Fix incorrect function name in treesit manual 51901736965 Add 'live' property to treesit-node-check (bug#61235) 56960a6558b Update to Transient v0.3.7-205-gb8ad0da 68a6b364d1c Fix 'rmail-summary-output' 67c6ec25590 lisp-mode: add docstring recognition for more common lisp... 417a8ed8b05 ; Improve discoverability of empty file names handling e47cf6ca15a Update to Transient v0.3.7-204-gecff8c2 b04cce02ff4 Fix Scala entry in Eglot's DB of LSP servers 973c1d24c6a ruby-ts-mode: Also don't reindent 'identifier' when insid... a5651c0c403 ruby-ts-mode: Fix indentation inside empty if/unless/case... 2956e54b1dd Add an extensive test for labeled (locked) narrowing 79ce185ad13 Update the documentation about labeled (locked) narrowing a6cd4553d48 Rename two long line optimizations variables 0d73e4aa261 Add specific symbols for narrowings d8438e2bb44 Add 'without-narrowing' macro 97314447e60 Make 'narrowing-lock' and 'narrowing-unlock' internal a4aa32bdfff Fix 'save-restriction' for narrowing locks # Conflicts: # etc/NEWS
author: Stefan Kangas 2023-02-15 14:41:04 +0100
committer: Stefan Kangas 2023-02-15 14:41:04 +0100
commit: 142f5683c1042a5344abd51b97fe8e0d0c8cc5f5 (patch)
tree: 5c66b054ed4cb2317e5fd6caa359bf812748de10 /src/buffer.c
parent: 571558e460059b3756f592abaaf2a9a67778db66 (diff)
parent: 7678b7e46f2e394447f39c3a6cf02bc285e5a5a4 (diff)
download: emacs-142f5683c1042a5344abd51b97fe8e0d0c8cc5f5.tar.gz
emacs-142f5683c1042a5344abd51b97fe8e0d0c8cc5f5.zip
1 files changed, 24 insertions, 23 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 38648519ba0..df1f5206668 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5916,40 +5916,41 @@ If nil, these display shortcuts will always remain disabled.
 There is no reason to change that value except for debugging purposes.  */);
  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 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 in which
-lines whose length is above `long-line-threshold', which see.  For
+`long-line-optimizations-p' is non-nil.  For performance reasons, in
-performance reasons, in such buffers, low-level hooks such as
+such buffers, the `fontification-functions', `pre-command-hook' and
-`fontification-functions' or `post-command-hook' are executed on a
+`post-command-hook' hooks are executed on a narrowed buffer around
-narrowed buffer, with a narrowing locked with `narrowing-lock'.  This
+point, as if they were called in a `with-restriction' form with a label.
-variable specifies the size of the narrowed region around point.
+This variable specifies the size of the narrowed region around point.
 To disable that narrowing, set this variable to 0.
-See also `long-line-locked-narrowing-bol-search-limit'.
+See also `long-line-optimizations-bol-search-limit'.
 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.
-This variable has effect only in buffers which contain one or more
+This variable has effect only in buffers in which
-lines whose length is above `long-line-threshold', which see.  For
+`long-line-optimizations-p' is non-nil.  For performance reasons, in
-performance reasons, in such buffers, low-level hooks such as
+such buffers, the `fontification-functions', `pre-command-hook' and
-`fontification-functions' or `post-command-hook' are executed on a
+`post-command-hook' hooks are executed on a narrowed buffer around
-narrowed buffer, with a narrowing locked with `narrowing-lock'.  The
+point, as if they were called in a `with-restriction' form with a label.
-variable `long-line-locked-narrowing-region-size' specifies the size
+The variable `long-line-optimizations-region-size' specifies the
-of the narrowed region around point.  This variable, which should be a
+size of the narrowed region around point.  This variable, which should
-small integer, specifies the number of characters by which that region
+be a small integer, specifies the number of characters by which that
-can be extended backwards to make it start at the beginning of a line.
+region 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.  */);
-  long_line_locked_narrowing_bol_search_limit = 128;
+  long_line_optimizations_bol_search_limit = 128;
  DEFVAR_INT ("large-hscroll-threshold", large_hscroll_threshold,
    doc: /* Horizontal scroll of truncated lines above which to use redisplay shortcuts.
author	Stefan Kangas	2023-02-15 14:41:04 +0100
committer	Stefan Kangas	2023-02-15 14:41:04 +0100
commit	142f5683c1042a5344abd51b97fe8e0d0c8cc5f5 (patch)
tree	5c66b054ed4cb2317e5fd6caa359bf812748de10 /src/buffer.c
parent	571558e460059b3756f592abaaf2a9a67778db66 (diff)
parent	7678b7e46f2e394447f39c3a6cf02bc285e5a5a4 (diff)
download	emacs-142f5683c1042a5344abd51b97fe8e0d0c8cc5f5.tar.gz emacs-142f5683c1042a5344abd51b97fe8e0d0c8cc5f5.zip

diff --git a/src/buffer.c b/src/buffer.c index 38648519ba0..df1f5206668 100644 --- a/src/buffer.c +++ b/src/buffer.c
@@ -5916,40 +5916,41 @@ If nil, these display shortcuts will always remain disabled.
5916	There is no reason to change that value except for debugging purposes. */);	5916	There is no reason to change that value except for debugging purposes. */);
5917	XSETFASTINT (Vlong_line_threshold, 50000);	5917	XSETFASTINT (Vlong_line_threshold, 50000);
5918		5918
5919	DEFVAR_INT ("long-line-locked-narrowing-region-size",	5919	DEFVAR_INT ("long-line-optimizations-region-size",
5920	long_line_locked_narrowing_region_size,	5920	long_line_optimizations_region_size,
5921	doc: /* Region size for locked narrowing in buffers with long lines.	5921	doc: /* Region size for narrowing in buffers with long lines.
5922		5922
5923	This variable has effect only in buffers which contain one or more	5923	This variable has effect only in buffers in which
5924	lines whose length is above `long-line-threshold', which see. For	5924	`long-line-optimizations-p' is non-nil. For performance reasons, in
5925	performance reasons, in such buffers, low-level hooks such as	5925	such buffers, the `fontification-functions', `pre-command-hook' and
5926	`fontification-functions' or `post-command-hook' are executed on a	5926	`post-command-hook' hooks are executed on a narrowed buffer around
5927	narrowed buffer, with a narrowing locked with `narrowing-lock'. This	5927	point, as if they were called in a `with-restriction' form with a label.
5928	variable specifies the size of the narrowed region around point.	5928	This variable specifies the size of the narrowed region around point.
5929		5929
5930	To disable that narrowing, set this variable to 0.	5930	To disable that narrowing, set this variable to 0.
5931		5931
5932	See also `long-line-locked-narrowing-bol-search-limit'.	5932	See also `long-line-optimizations-bol-search-limit'.
5933		5933
5934	There is no reason to change that value except for debugging purposes. */);	5934	There is no reason to change that value except for debugging purposes. */);
5935	long_line_locked_narrowing_region_size = 500000;	5935	long_line_optimizations_region_size = 500000;
5936		5936
5937	DEFVAR_INT ("long-line-locked-narrowing-bol-search-limit",	5937	DEFVAR_INT ("long-line-optimizations-bol-search-limit",
5938	long_line_locked_narrowing_bol_search_limit,	5938	long_line_optimizations_bol_search_limit,
5939	doc: /* Limit for beginning of line search in buffers with long lines.	5939	doc: /* Limit for beginning of line search in buffers with long lines.
5940		5940
5941	This variable has effect only in buffers which contain one or more	5941	This variable has effect only in buffers in which
5942	lines whose length is above `long-line-threshold', which see. For	5942	`long-line-optimizations-p' is non-nil. For performance reasons, in
5943	performance reasons, in such buffers, low-level hooks such as	5943	such buffers, the `fontification-functions', `pre-command-hook' and
5944	`fontification-functions' or `post-command-hook' are executed on a	5944	`post-command-hook' hooks are executed on a narrowed buffer around
5945	narrowed buffer, with a narrowing locked with `narrowing-lock'. The	5945	point, as if they were called in a `with-restriction' form with a label.
5946	variable `long-line-locked-narrowing-region-size' specifies the size	5946	The variable `long-line-optimizations-region-size' specifies the
5947	of the narrowed region around point. This variable, which should be a	5947	size of the narrowed region around point. This variable, which should
5948	small integer, specifies the number of characters by which that region	5948	be a small integer, specifies the number of characters by which that
5949	can be extended backwards to make it start at the beginning of a line.	5949	region can be extended backwards to make it start at the beginning of
		5950	a line.
5950		5951
5951	There is no reason to change that value except for debugging purposes. */);	5952	There is no reason to change that value except for debugging purposes. */);
5952	long_line_locked_narrowing_bol_search_limit = 128;	5953	long_line_optimizations_bol_search_limit = 128;
5953		5954
5954	DEFVAR_INT ("large-hscroll-threshold", large_hscroll_threshold,	5955	DEFVAR_INT ("large-hscroll-threshold", large_hscroll_threshold,
5955	doc: /* Horizontal scroll of truncated lines above which to use redisplay shortcuts.	5956	doc: /* Horizontal scroll of truncated lines above which to use redisplay shortcuts.