# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1325586943 -3600
# Node ID 41ea1c7c240ab4bb11a858424e1d1e2d8bb3b7d9
# Parent  bbaef3edbe87c09ad2516b64acdbace85d482e53
maint.mk: remove temporary transition aid from over 1.5 years ago

* top/maint.mk (_prohibit_regexp): Remove definition whose sole
purpose was to aid in the transition (avoiding silent malfunction)
from that old name to the new _sc_search_regexp.  This shim was
added by commit 219c504b.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-01-03  Jim Meyering  <meyering@redhat.com>
 
+	maint.mk: remove temporary transition aid from over 1.5 years ago
+	* top/maint.mk (_prohibit_regexp): Remove definition whose sole
+	purpose was to aid in the transition (avoiding silent malfunction)
+	from that old name to the new _sc_search_regexp.  This shim was
+	added by commit 219c504b.
+
 	init.sh: do not try to accommodate compare arguments starting with "-"
 	* tests/init.sh (compare_dev_null_): Do not try to accommodate
 	compare arguments that start with "-".  Besides, we do not worry
diff --git a/top/maint.mk b/top/maint.mk
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -221,15 +221,6 @@
    { printf '%s\n' "$(ME): $$msg" 1>&2; exit 1; };
 endef
 
-# _sc_search_regexp used to be named _prohibit_regexp.  However,
-# upgrading to the new definition and leaving the old name undefined
-# would usually convert each custom rule using $(_prohibit_regexp)
-# (usually defined in cfg.mk) into a no-op.  This definition ensures
-# that people know right away if they're still using the old name.
-# FIXME: remove in 2012.
-_prohibit_regexp = \
-  $(error '*** you need to s/_prohibit_regexp/_sc_search_regexp/, and adapt')
-
 define _sc_search_regexp
    dummy=; : so we do not need a semicolon before each use;		\
 									\