From d1bee4874b2203ba1a067530f4142e969200f97d Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Sat, 2 Nov 2024 17:38:49 +0100
Subject: [PATCH] Undeprecate if-let and when-let

See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=+73853.
---
 borg.mk    | 3 +++
 default.mk | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/borg.mk b/borg.mk
index 206ca2c..3505afd 100644
--- a/borg.mk
+++ b/borg.mk
@@ -37,6 +37,9 @@ EMACS_EXTRA ?=
 .FORCE:
 
 SILENCIO += --eval "(progn (require 'gv) (put 'buffer-substring 'byte-obsolete-generalized-variable nil))"
+SILENCIO += --eval "(progn \
+  (put 'if-let 'byte-obsolete-info nil) \
+  (put 'when-let 'byte-obsolete-info nil))"
 SILENCIO += --eval "(define-advice message (:around (fn format &rest args) silencio)\
   (unless (or (equal format \"Not registering prefix \\\"%s\\\" from %s.  Affects: %S\")\
               (ignore-errors (string-match-p \"Scraping files for\" (car args))))\
diff --git a/default.mk b/default.mk
index 515dd6b..82dd4a9 100644
--- a/default.mk
+++ b/default.mk
@@ -17,7 +17,9 @@ VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0 | cut -c
 REVDESC := $(shell test -e $(TOP).git && git describe --tags)
 
 EMACS      ?= emacs
-EMACS_ARGS ?=
+EMACS_ARGS ?= --eval "(progn \
+  (put 'if-let 'byte-obsolete-info nil) \
+  (put 'when-let 'byte-obsolete-info nil))"
 
 LOAD_PATH  ?= $(addprefix -L ../,$(DEPS))
 LOAD_PATH  += -L .