[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master e288e1b2f35 1/7: Remove "erc-" prefixed Compat definitions
From: |
F. Jason Park |
Subject: |
master e288e1b2f35 1/7: Remove "erc-" prefixed Compat definitions |
Date: |
Fri, 16 Feb 2024 23:04:40 -0500 (EST) |
branch: master
commit e288e1b2f352952e826727967a406c8675fd5594
Author: F. Jason Park <jp@neverwas.me>
Commit: F. Jason Park <jp@neverwas.me>
Remove "erc-" prefixed Compat definitions
* lisp/erc/erc-compat.el: Remove NO-ERROR argument from top-level
`require' for library `compat' because it's guaranteed to be present.
(erc-compat-function, erc-compat-call): Redefine as obsolete aliases
for unprefixed namesakes.
* lisp/erc/erc-fill.el (erc-fill-wrap-nudge): Use `compat-call'
instead of `erc-compat-call'.
---
lisp/erc/erc-compat.el | 46 +++-------------------------------------------
lisp/erc/erc-fill.el | 2 +-
2 files changed, 4 insertions(+), 44 deletions(-)
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 9b8699f6949..b5b8fbaf8ab 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -31,51 +31,11 @@
;;; Code:
-(require 'compat nil 'noerror)
+(require 'compat)
(eval-when-compile (require 'cl-lib))
-;; Except for the "erc-" namespacing, these two definitions should be
-;; continuously updated to match the latest upstream ones verbatim.
-;; Although they're pretty simple, it's likely not worth checking for
-;; and possibly deferring to the non-prefixed versions.
-;;
-;; BEGIN Compat macros
-
-;;;; Macros for extended compatibility function calls
-
-(defmacro erc-compat-function (fun)
- "Return compatibility function symbol for FUN.
-
-If the Emacs version provides a sufficiently recent version of
-FUN, the symbol FUN is returned itself. Otherwise the macro
-returns the symbol of a compatibility function which supports the
-behavior and calling convention of the current stable Emacs
-version. For example Compat 29.1 will provide compatibility
-functions which implement the behavior and calling convention of
-Emacs 29.1.
-
-See also `compat-call' to directly call compatibility functions."
- (let ((compat (intern (format "compat--%s" fun))))
- `#',(if (fboundp compat) compat fun)))
-
-(defmacro erc-compat-call (fun &rest args)
- "Call compatibility function or macro FUN with ARGS.
-
-A good example function is `plist-get' which was extended with an
-additional predicate argument in Emacs 29.1. The compatibility
-function, which supports this additional argument, can be
-obtained via (compat-function plist-get) and called
-via (compat-call plist-get plist prop predicate). It is not
-possible to directly call (plist-get plist prop predicate) on
-Emacs older than 29.1, since the original `plist-get' function
-does not yet support the predicate argument. Note that the
-Compat library never overrides existing functions.
-
-See also `compat-function' to lookup compatibility functions."
- (let ((compat (intern (format "compat--%s" fun))))
- `(,(if (fboundp compat) compat fun) ,@args)))
-
-;; END Compat macros
+(define-obsolete-function-alias 'erc-compat-function #'compat-function "30.1")
+(define-obsolete-function-alias 'erc-compat-call #'compat-call "30.1")
;;;###autoload(autoload 'erc-define-minor-mode "erc-compat")
(define-obsolete-function-alias 'erc-define-minor-mode
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index b91ce007087..547b3a11043 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -832,7 +832,7 @@ decorations applied by third-party modules."
(line (count-screen-lines (window-start) (window-point))))
(when (zerop arg)
(setq arg 1))
- (erc-compat-call
+ (compat-call
set-transient-map
(let ((map (make-sparse-keymap)))
(dolist (key '(?= ?- ?0))
- master updated (537914561eb -> 3d87e343276), F. Jason Park, 2024/02/16
- master d7c18a7b4f2 5/7: Ignore the TGT-LIST parameter in erc-open, F. Jason Park, 2024/02/16
- master 1a36d52413c 3/7: Autoload custom-loads for new Custom groups in erc.el, F. Jason Park, 2024/02/16
- master 25d15391f26 6/7: Normalize ISUPPORT params with empty values in ERC, F. Jason Park, 2024/02/16
- master 9668b4f97c2 4/7: Make erc-fill-wrap depend on scrolltobottom, F. Jason Park, 2024/02/16
- master 3d87e343276 7/7: Use modern fallback for channel name detection in ERC, F. Jason Park, 2024/02/16
- master a43b062ee57 2/7: ; Load erc-compat before ert-x in ERC tests, F. Jason Park, 2024/02/16
- master e288e1b2f35 1/7: Remove "erc-" prefixed Compat definitions,
F. Jason Park <=