[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/compat 4d3d0bf680 08/10: Fix duplicate definition testi
From: |
ELPA Syncer |
Subject: |
[elpa] externals/compat 4d3d0bf680 08/10: Fix duplicate definition testing checking |
Date: |
Mon, 28 Feb 2022 03:57:33 -0500 (EST) |
branch: externals/compat
commit 4d3d0bf6808d62277b2302c702051b853dd6ffcb
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>
Fix duplicate definition testing checking
---
compat-macs.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/compat-macs.el b/compat-macs.el
index d487627a67..35d0b55b8e 100644
--- a/compat-macs.el
+++ b/compat-macs.el
@@ -149,8 +149,10 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
(realname (or (plist-get attr :realname)
(intern (format "compat--%S" name))))
(body `(progn
- (when (get ',name 'compat-def)
- (error "Duplicate compatibility definition: %s" ',name))
+ (unless (or (null (get ',name 'compat-def))
+ (eq (get ',name 'compat-def) ',realname))
+ (error "Duplicate compatibility definition: %s (was %s,
now %s)"
+ ',name (get ',name 'compat-def) ',realname))
(put ',name 'compat-def ',realname)
,(funcall install-fn realname version))))
`(progn
- [elpa] externals/compat updated (ab08067970 -> 8792ab17be), ELPA Syncer, 2022/02/28
- [elpa] externals/compat 0faf5f469c 03/10: Merge branch 'master' into testing, ELPA Syncer, 2022/02/28
- [elpa] externals/compat 5d4fdf41db 01/10: Merge byte compilation output into a single file, ELPA Syncer, 2022/02/28
- [elpa] externals/compat ccc8b1fd36 02/10: Compress and merge the compiled result of compat.elc, ELPA Syncer, 2022/02/28
- [elpa] externals/compat 50b26ffdf2 07/10: Install nadvice in compat-tests before loading compat, ELPA Syncer, 2022/02/28
- [elpa] externals/compat 28f57d52a0 06/10: Fix copyright for compat-font-lock.el, ELPA Syncer, 2022/02/28
- [elpa] externals/compat a793b0b6e9 05/10: Extract font-locking into compat-font-lock.el, ELPA Syncer, 2022/02/28
- [elpa] externals/compat 4d3d0bf680 08/10: Fix duplicate definition testing checking,
ELPA Syncer <=
- [elpa] externals/compat 8792ab17be 10/10: Merge branch 'testing', ELPA Syncer, 2022/02/28
- [elpa] externals/compat c91756bad6 04/10: Have a prefixed minimal compatibility expand to nil, ELPA Syncer, 2022/02/28
- [elpa] externals/compat 164672060f 09/10: Only generate verbose expansions when testing, ELPA Syncer, 2022/02/28