master updated (d096819089 -> 86938bfbea)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  d096819089 Remove hard-coded path to pwd in Makefiles.
      adds  b1e92c59ed Avoid assertion violations in 'pop_it'
      adds  8033947fe2 .mailcap: Some additional fixes.
       new  86938bfbea Merge from origin/emacs-28


Summary of changes:
 .mailmap    | 40 ++++++++++++++++++++++++++++++++++++++--
 src/xdisp.c |  9 ++++++++-
 2 files changed, 46 insertions(+), 3 deletions(-)