From: Glenn Morris <rgm@gnu.org>
Date: Thu, 6 Feb 2020 15:50:29 +0000 (-0800)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~7908^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=15814d0ccd95848a2a0513d93ab718a49b289598;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

b2e27d8617 (origin/emacs-27) Revert "Signal user-error on duplicate p...
---

15814d0ccd95848a2a0513d93ab718a49b289598