aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorPaul Eggert2021-10-13 11:19:12 -0700
committerPaul Eggert2021-10-13 11:19:12 -0700
commit8e072e6abef2bf1ec75b7c73883caeb7b7459eb1 (patch)
tree3d4b7f160e426a57f1bcf435034835e879c7c25d /src/buffer.c
parent396d2d88afe254715eb3b09226e0353e72c47936 (diff)
parentefb1cd7fa9f1a71ad3bf34627fe678acfcb48b38 (diff)
downloademacs-8e072e6abef2bf1ec75b7c73883caeb7b7459eb1.tar.gz
emacs-8e072e6abef2bf1ec75b7c73883caeb7b7459eb1.zip
Merge from origin/emacs-28
efb1cd7fa9 ; * etc/charsets/README: Update the format documentation. cc796b7409 Tramp doc cleanup a338d46060 Make emacs-lisp-byte-compile-and-load load the .elc file a... 3eac7dc780 Fix point movement in image-dired 4e9452a399 Improve shortdoc for vector f223ac6ef9 Fix test bug when calloc returns null ebeaa54f19 Pacify GCC 11 -fanalyzer on x86-64 56d1f42f30 Improve handling of non-character events in input methods 3fbe6fd367 ; Fix mistakes in last doc rewording about shorthands
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 648d7227d8b..9d8892a797a 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3845,7 +3845,9 @@ fix_overlays_before (struct buffer *bp, ptrdiff_t prev, ptrdiff_t pos)
3845 or the found one ends before PREV, 3845 or the found one ends before PREV,
3846 or the found one is the last one in the list, 3846 or the found one is the last one in the list,
3847 we don't have to fix anything. */ 3847 we don't have to fix anything. */
3848 if (!tail || end < prev || !tail->next) 3848 if (!tail)
3849 return;
3850 if (end < prev || !tail->next)
3849 return; 3851 return;
3850 3852
3851 right_pair = parent; 3853 right_pair = parent;