From e3dd43e247591e588f530ed15867766aa9cc9482 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 14 Jul 2022 14:22:44 +0200 Subject: Define ring-member immediately if necessary Right above the changed lines we require `ring'. It is therefore not necessary to delay evaluation until `ring' has been loaded; we know it has already been loaded. --- elisp/geiser-base.el | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/elisp/geiser-base.el b/elisp/geiser-base.el index 5436224..6100898 100644 --- a/elisp/geiser-base.el +++ b/elisp/geiser-base.el @@ -16,15 +16,14 @@ (require 'ring) -(eval-after-load "ring" - '(when (not (fboundp 'ring-member)) - (defun ring-member (ring item) - (catch 'found - (dotimes (ind (ring-length ring)) - (when (equal item (ring-ref ring ind)) - (throw 'found ind))))))) - -(when (not (fboundp 'looking-at-p)) +(unless (fboundp 'ring-member) + (defun ring-member (ring item) + (catch 'found + (dotimes (ind (ring-length ring)) + (when (equal item (ring-ref ring ind)) + (throw 'found ind)))))) + +(unless (fboundp 'looking-at-p) (defsubst looking-at-p (regexp) (with-no-warnings (let ((inhibit-changing-match-data t)) -- cgit v1.2.3