diff options
| author | Glenn Morris | 2020-04-11 07:50:12 -0700 |
|---|---|---|
| committer | Glenn Morris | 2020-04-11 07:50:12 -0700 |
| commit | 1988ffbaed709dfc71126efbf06644476830f07e (patch) | |
| tree | fdc98855a3ab7bf6d6cb4c8826ec4a9dfc603d33 /src/intervals.c | |
| parent | b902d7c9d07b2cc951fa5c789d585d65366d19d2 (diff) | |
| parent | fd27685c1e68e742abf1698573dac53743f15e48 (diff) | |
| download | emacs-1988ffbaed709dfc71126efbf06644476830f07e.tar.gz emacs-1988ffbaed709dfc71126efbf06644476830f07e.zip | |
Merge from origin/emacs-27
fd27685c1e (origin/emacs-27) ; * doc/lispref/keymaps.texi (Extended M...
6057d79a4e * doc/lispref/keymaps.texi (Extended Menu Items): Tweak :k...
17a1bb5a03 Fix redisplay when scrolling under redisplay-dont-pause
90321f595c Fix face extension in pulse.el
36c42d2a30 * doc/misc/tramp.texi (Bug Reports): Avoid line breaks in ...
d5750af151 Avoid assertion violation in intervals.c
18d1bc0a09 Improve documentation of 'jit-lock-contextually'
08486f4cae Speed up 'resize-mode' child frames a little
f451ef9308 ; * etc/NEWS: Mention 'executing-macro' in removed vars.
c49d379f17 Fix some problems with moving and resizing child frames
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src/intervals.c')
| -rw-r--r-- | src/intervals.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/intervals.c b/src/intervals.c index 594d8924ebc..d4a734c923c 100644 --- a/src/intervals.c +++ b/src/intervals.c | |||
| @@ -1187,7 +1187,7 @@ delete_interval (register INTERVAL i) | |||
| 1187 | register INTERVAL parent; | 1187 | register INTERVAL parent; |
| 1188 | ptrdiff_t amt = LENGTH (i); | 1188 | ptrdiff_t amt = LENGTH (i); |
| 1189 | 1189 | ||
| 1190 | eassert (amt == 0); /* Only used on zero-length intervals now. */ | 1190 | eassert (amt <= 0); /* Only used on zero total-length intervals now. */ |
| 1191 | 1191 | ||
| 1192 | if (ROOT_INTERVAL_P (i)) | 1192 | if (ROOT_INTERVAL_P (i)) |
| 1193 | { | 1193 | { |