[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/fcr a21cbc0: lisp/emacs-lisp/fcr.el: Rename `fcr-make` to `fcr-l
From: |
Stefan Monnier |
Subject: |
scratch/fcr a21cbc0: lisp/emacs-lisp/fcr.el: Rename `fcr-make` to `fcr-lambda` |
Date: |
Fri, 17 Dec 2021 12:45:09 -0500 (EST) |
branch: scratch/fcr
commit a21cbc05f2889b3eea71024f3a4a032deb448c26
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
lisp/emacs-lisp/fcr.el: Rename `fcr-make` to `fcr-lambda`
* lisp/emacs-lisp/fcr.el (fcr-lambda): Rename from `fcr-make`.
* lisp/emacs-lisp/cl-generic.el (cl-generic-call-method):
* test/lisp/emacs-lisp/fcr-tests.el (fcr-tests):
* lisp/kmacro.el (kmacro-lambda-form): Adjust accordingly.
---
lisp/emacs-lisp/cl-generic.el | 2 +-
lisp/emacs-lisp/fcr.el | 2 +-
lisp/kmacro.el | 4 ++--
test/lisp/emacs-lisp/fcr-tests.el | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 6ba3849..5e7b815 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -742,7 +742,7 @@ FUN is the function that should be called when METHOD calls
(if fun
(lambda (&rest cnm-args)
(apply fun (or cnm-args args)))
- (fcr-make cl--generic-nnm () (&rest cnm-args)
+ (fcr-lambda cl--generic-nnm () (&rest cnm-args)
(apply #'cl-no-next-method generic method
(or cnm-args args))))
args)))))
diff --git a/lisp/emacs-lisp/fcr.el b/lisp/emacs-lisp/fcr.el
index 86ebcf3..4e2b5c6 100644
--- a/lisp/emacs-lisp/fcr.el
+++ b/lisp/emacs-lisp/fcr.el
@@ -186,7 +186,7 @@
(defalias predname pred)
(put name 'cl-deftype-handler (lambda () type))))
-(defmacro fcr-make (type fields args &rest body)
+(defmacro fcr-lambda (type fields args &rest body)
(declare (indent 3) (debug (sexp (&rest (sexp form)) sexp def-body)))
;; FIXME: Provide the fields in the order specified by `type'.
(let* ((class (cl--find-class type))
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 211f0ab..b6779db 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -823,8 +823,8 @@ If kbd macro currently being defined end it before
activating it."
;; or only `mac' is provided, as a list (MAC COUNTER FORMAT).
;; The first is used from `insert-kbd-macro' and `edmacro-finish-edit',
;; while the second is used from within this file.
- (fcr-make kmacro-function ((mac (if counter (list mac counter format) mac)))
- (&optional arg)
+ (fcr-lambda kmacro-function ((mac (if counter (list mac counter format)
mac)))
+ (&optional arg)
(interactive "p")
(kmacro-exec-ring-item mac arg)))
diff --git a/test/lisp/emacs-lisp/fcr-tests.el
b/test/lisp/emacs-lisp/fcr-tests.el
index 8df61ed..379fa27 100644
--- a/test/lisp/emacs-lisp/fcr-tests.el
+++ b/test/lisp/emacs-lisp/fcr-tests.el
@@ -41,12 +41,12 @@
(ert-deftest fcr-tests ()
(let* ((i 42)
- (fcr1 (fcr-make fcr-test ((fst 1) (snd 2) (name "hi"))
- ()
- (list fst snd i)))
- (fcr2 (fcr-make fcr-test ((name (cl-incf i)) (fst (cl-incf i)))
- ()
- (list fst snd 152 i))))
+ (fcr1 (fcr-lambda fcr-test ((fst 1) (snd 2) (name "hi"))
+ ()
+ (list fst snd i)))
+ (fcr2 (fcr-lambda fcr-test ((name (cl-incf i)) (fst (cl-incf i)))
+ ()
+ (list fst snd 152 i))))
(message "hello-1")
(should (equal (list (fcr-test--fst fcr1)
(fcr-test--snd fcr1)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- scratch/fcr a21cbc0: lisp/emacs-lisp/fcr.el: Rename `fcr-make` to `fcr-lambda`,
Stefan Monnier <=