From: Glenn Morris <rgm@gnu.org>
Date: Sat, 23 May 2020 14:50:30 +0000 (-0700)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~7292
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=294495de8e93c094aa25df55905dac61975643b9;p=emacs.git

; Merge from origin/emacs-27

The following commits were skipped:

c0aa2f2abf CC Mode: Fix bug #39972, by fixing c-display-defun-name fo...
62a5e890d7 Redo RCS Id for pdumper
---

294495de8e93c094aa25df55905dac61975643b9