master 86938bfbea: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 86938bfbeae8eff8c85c998986ccb8f719c483c5
Merge: d096819089 8033947fe2
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-28
    
    8033947fe2 .mailcap: Some additional fixes.
    b1e92c59ed Avoid assertion violations in 'pop_it'
---
 .mailmap    | 40 ++++++++++++++++++++++++++++++++++++++--
 src/xdisp.c |  9 ++++++++-
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index f231fb5cc7..4066ab30c8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,8 +8,14 @@
 #
 # Keep file sorted using `M-x sort-lines'.
 #
+Aaron S. Hawley <aaron.s.hawley@gmail.com> <Aaron.Hawley@vtinfo.com>
+Aaron S. Hawley <aaron.s.hawley@gmail.com> <Aaron.S.Hawley@gmail.com>
+Aaron S. Hawley <aaron.s.hawley@gmail.com> <ashawley@burlingtontelecom.net>
 Alan Third <alan@idiocy.org>
 Alan Third <alan@idiocy.org> <alan@breton-build.holly.idiocy.org>
+Alan Third <alan@idiocy.org> Alan Third <address@hidden>
+Alan Third <alan@idiocy.org> bug-gnu-emacs@gnu.org <bug-gnu-emacs@gnu.org>
+Alex Harsanyi <AlexHarsanyi@gmail.com> <harsanyi@mac.com>
 Alexander Gramiak <agrambot@gmail.com>
 Amin Bandali <bandali@gnu.org> <mab@gnu.org>
 Andrea Corallo <akrl@sdf.org>
@@ -22,13 +28,19 @@ Arash Esbati <arash@gnu.org> <arash.esbati@gmail.com>
 Arash Esbati <arash@gnu.org> <esbati@gmx.de>
 Artur Malabarba <bruce.connor.am@gmail.com> <am12548@it055607.users.bris.ac.uk>
 Bastien Guerry <bzg@gnu.org>
+Bastien Guerry <bzg@gnu.org> <bastien1@free.fr>
+Bastien Guerry <bzg@gnu.org> <bzg@altern.org>
+Bruno Félix Rezende Ribeiro <oitofelix@gnu.org> <oitofelix@gmail.com>
 Carlos Pita <carlosjosepita@gmail.com>
 Chong Yidong <cyd@gnu.org> <cyd@stupidchicken.com>
 Christoph Scholtes <cschol2112@gmail.com>
 Christoph Scholtes <cschol2112@gmail.com> <cschol2112@googlemail.com>
+Christoph Scholtes <cschol2112@gmail.com> Christoph Scholtes <>
 Clément Pit-Claudel <clement.pitclaudel@live.com>
 Clément Pit-Claudel <clement.pitclaudel@live.com> <clement.pit@gmail.com>
 Courtney Bane <emacs-bugs-7626@cbane.org>
+Daiki Ueno <ueno@gnu.org> <ueno@unixuser.org>
+Daiki Ueno <ueno@gnu.org> Daiki Ueno <ueno@debian>
 Dan Nicolaescu <dann@ics.uci.edu> <dann@gnu.org>
 Dan Nicolaescu <dann@ics.uci.edu> <done@ece.arizona.edu>
 Daniel Colascione <dancol@dancol.org> <dan.colascione@gmail.com>
@@ -36,6 +48,7 @@ David Abrahams <dave@boostpro.com>
 David M. Koppelman <koppel@ece.lsu.edu>
 Deniz Dogan <deniz@dogan.se> <deniz.a.m.dogan@gmail.com>
 Dick R. Chiang <dick.r.chiang@gmail.com>
+Dick R. Chiang <dick.r.chiang@gmail.com> dickmao <none>
 Earl Hyatt <ej32u@protonmail.com>
 Earl Hyatt <ej32u@protonmail.com> <okamsn@protonmail.com>
 Edward M. Reingold <reingold@emr.cs.iit.edu>
@@ -43,9 +56,13 @@ Eli Zaretskii <eliz@gnu.org> <eliz@is.elta.co.il>
 Emilio C. Lopes <eclig@gmx.net>
 Enami Tsugutomo <tsugutomo.enami@jp.sony.com>
 Era Eriksson <era+emacs@iki.fi> <era+emacsbugs@iki.fi>
+Eric Ludlam <zappo@gnu.org>
+Eric Ludlam <zappo@gnu.org> <eric@siege-engine.com>
+Eric Ludlam <zappo@gnu.org> <ericludlam@gmail.com>
 Eric S. Raymond <esr@thyrsus.com> <esr@snark.thyrsus.com>
 Etienne Prud’homme <e.e.f.prudhomme@gmail.com>
 Fabián Ezequiel Gallina <fgallina@gnu.org> <fgallina@cuca>
+Fabián Ezequiel Gallina <fgallina@gnu.org> <galli.87@gmail.com>
 Francis Litterio <flitterio@gmail.com>
 Gabor Vida <vidagabor@gmail.com>
 Gerd Möllmann <gerd@gnu.org>
@@ -53,7 +70,7 @@ Gerd Möllmann <gerd@gnu.org> <gerd.moellmann@gmail.com>
 Glenn Morris <rgm@gnu.org>
 Glenn Morris <rgm@gnu.org> <rgm@fencepost>
 Glenn Morris <rgm@gnu.org> <rgm@stanford.edu>
-Gnus developers <ding@gnus.org> <ding@gnus.org.noreply>
+Gnus developers <ding@gnus.org.noreply> <ding@gnus.org>
 Gregory Heytings <gregory@heytings.org> <ghe@sdf.org>
 Grégoire Jadi <daimrod@gmail.com>
 Ian Dunn <dunni@gnu.org>
@@ -68,12 +85,17 @@ Joakim Verona <joakim@verona.se> <root@exodia.verona.se>
 John Wiegley <johnw@newartisans.com> <jwiegley@gmail.com>
 Jose A. Ortega Ruiz <jao@gnu.org>
 João Távora <joaotavora@gmail.com>
+Julien Danjou <julien@danjou.info> <jd@dex.adm.naquadah.org>
+Julien Danjou <julien@danjou.info> Julien Danjou <jd@abydos>
 Juri Linkov <juri@linkov.net> <juri@jurta.org>
 Jérémy Compostella <jeremy.compostella@gmail.com>
 Jürgen Hötzel <juergen@archlinux.org>
 Karl Fogel <kfogel@red-bean.com> <karl.fogel@canonical.com>
+Katsumi Yamaoka <yamaoka@jpl.org> <katsumi@flagship2>
 Kaushal Modi <kaushal.modi@gmail.com>
 Kelvin White <kwhite@gnu.org>
+Kelvin White <kwhite@gnu.org> <kelvin.white77@gmail.com>
+Ken Raeburn <raeburn@raeburn.org> <raeburn@permabit.com>
 Kenichi Handa <handa@gnu.org>
 Kenichi Handa <handa@gnu.org> <handa@etlken>
 Kenichi Handa <handa@gnu.org> <handa@m17n.org>
@@ -86,8 +108,10 @@ Lars Ingebrigtsen <larsi@gnus.org> <larsi@quimbies.gnus.org>
 Lars Ingebrigtsen <larsi@gnus.org> <larsi@stories.gnus.org>
 Lin Sun <lin.sun@zoom.us>
 Ludovic Courtès <ludo@gnu.org>
+Luke Lee <luke.yx.lee@gmail.com>
 Martin Rudalics <rudalics@gmx.at>
 Martin Rudalics <rudalics@gmx.at> <“rudalics@gmx.at”>
+Masatake YAMATO <yamato@redhat.com> <jet@gyve.org>
 Matt Armstrong <matt@rfc20.org> <marmstrong@google.com>
 Matt Armstrong <matt@rfc20.org> <matt@mdeb>
 Mattias Engdegård <mattiase@acm.org>
@@ -116,10 +140,13 @@ Phillip Lord <phillip.lord@russet.org.uk> 
<phillip.lord@newcastle.ac.uk>
 Pierre Lorenzon <devel@pollock-nageoire.net>
 Pieter van Oostrum <pieter@vanoostrum.org> <pieter-l@vanoostrum.org>
 Pip Cet <pipcet@gmail.com>
+Po Lu <luangruo@yahoo.com> Po Lu via <emacs-devel@gnu.org>
 Przemysław Wojnowski <esperanto@cumego.com>
 Rasmus <rasmus@gmx.us>
 Richard M. Stallman <rms@gnu.org>
 Robert J. Chassell <bob@gnu.org> <bob@rattlesnake.com>
+Robert Weiner <rsw@gnu.org> <rswgnu@gmail.com>
+Roland Winkler <winkler@gnu.org> <Roland.Winkler@physik.uni-erlangen.de>
 Ronnie Schnell <ronnie@driver-aces.com>
 Ryan C. Thompson <rct@thompsonclan.org>
 Simen Heggestøyl <simenheg@gmail.com>
@@ -127,6 +154,13 @@ Simen Heggestøyl <simenheg@gmail.com> <simenheg@ifi.uio.no>
 Simon Josefsson <simon@josefsson.org> <jas@extundo.com>
 Stefan Kangas <stefankangas@gmail.com> <stefan@marxist.se>
 Stefan Monnier <monnier@iro.umontreal.ca> <monnier@IRO.UMontreal.CA>
+Stephen Berman <stephen.berman@gmx.net> <Stephen.Berman@gmx.net>
+Stephen Berman <stephen.berman@gmx.net> <Stephen.Berman@gmx.net>
+Stephen Berman <stephen.berman@gmx.net> <steve@rosalinde.fritz.box>
+Stephen Gildea <stepheng+emacs@gildea.com>
+Stephen Gildea <stepheng+emacs@gildea.com> <gildea@stop.mail-abuse.org>
+Stephen Gildea <stepheng+emacs@gildea.com> 
<stepheng+git-config-global@gildea.com>
+Stephen Gildea <stepheng+emacs@gildea.com> <stepheng+savannah@gildea.com>
 Tassilo Horn <tsdh@gnu.org> <tassilo@member.fsf.org>
 Ted Zlatanov <tzz@lifelogs.com>
 Thien-Thi Nguyen <ttn@gnu.org> <ttn@gnuvola.org>
@@ -134,8 +168,10 @@ Thierry Volpiatto <thievol@posteo.net> 
<thierry.volpiatto@gmail.com>
 Tino Calancha <ccalancha@suse.com> <f92capac@gmail.com>
 Tino Calancha <ccalancha@suse.com> <tino.calancha@gmail.com>
 Tom Tromey <tom@tromey.com> <tromey@redhat.com>
-Ulf Jasper <ulf.jasper@web.de> <ulf@uthinkpad>
+Ulf Jasper <ulf.jasper@web.de> Ulf Jasper <>
+Ulf Jasper <ulf.jasper@web.de> Ulf Jasper <ulf@uthinkpad>
 Ulrich Müller <ulm@gentoo.org>
+Vinicius Jose Latorre <viniciusjl@ig.com.br> <viniciusjl.gnu@gmail.com>
 Werner Lemberg <wl@gnu.org>
 Wolfgang Scherer <wolfgang.scherer@gmx.de> <Wolfgang.Scherer@gmx.de>
 Xi Lu <lx@shellcodes.org>
diff --git a/src/xdisp.c b/src/xdisp.c
index ee074c018e..1f6f35e6c0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7043,7 +7043,14 @@ pop_it (struct it *it)
               || (STRINGP (it->object)
                   && IT_STRING_CHARPOS (*it) == it->bidi_it.charpos
                   && IT_STRING_BYTEPOS (*it) == it->bidi_it.bytepos)
-              || (CONSP (it->object) && it->method == GET_FROM_STRETCH));
+              || (CONSP (it->object) && it->method == GET_FROM_STRETCH)
+              /* We could be in the middle of handling a list or a
+                 vector of several 'display' properties, in which
+                 case we should only verify the above conditions when
+                 we pop the iterator stack the last time, because
+                 higher stack levels cannot "iterate out of the
+                 display property".  */
+              || it->sp > 0);
     }
   /* If we move the iterator over text covered by a display property
      to a new buffer position, any info about previously seen overlays