aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Lochbaum <mwlochbaum@gmail.com>2021-02-11 21:16:33 -0500
committerMarshall Lochbaum <mwlochbaum@gmail.com>2021-02-11 21:16:33 -0500
commitf998b922f160ee835bb5d51a412c2c11e27f6e85 (patch)
tree6178ab929b0d1464e1673c9f7e0dd265358d5492
parent3780583cfe6d2abf7e6259a251345de83f8c889a (diff)
Use cl-lib instead of cl
-rw-r--r--editors/emacs/bqn-input.el9
-rw-r--r--editors/emacs/bqn-mode.el4
-rw-r--r--editors/emacs/bqn-syntax.el7
3 files changed, 11 insertions, 9 deletions
diff --git a/editors/emacs/bqn-input.el b/editors/emacs/bqn-input.el
index 08a01617..4dd72bd5 100644
--- a/editors/emacs/bqn-input.el
+++ b/editors/emacs/bqn-input.el
@@ -1,5 +1,6 @@
;;; -*- lexical-binding: t -*-
+(require 'cl-lib)
(require 'quail)
(require 'bqn-symbols)
@@ -24,13 +25,13 @@
(quail-install-map
(let* ((prefix (string new))
(bqn--transcription-alist
- (loop for command in bqn--symbols
- for key-command = (third command)
- append (loop for s in (if (listp key-command)
+ (cl-loop for command in bqn--symbols
+ for key-command = (cl-third command)
+ append (cl-loop for s in (if (listp key-command)
key-command
(list key-command))
collect (cons (concat prefix s)
- (second command))))))
+ (cl-second command))))))
(quail-map-from-table
'((default bqn--transcription-alist)))))
(set-default symbol new))
diff --git a/editors/emacs/bqn-mode.el b/editors/emacs/bqn-mode.el
index 57a0c44e..fa4dc654 100644
--- a/editors/emacs/bqn-mode.el
+++ b/editors/emacs/bqn-mode.el
@@ -22,13 +22,13 @@
;;; Keymap functions
;;;
-(require 'cl)
+(require 'cl-lib)
(require 'bqn-symbols)
(defun bqn--make-key-command-sym (n)
(intern (concat "insert-sym-bqn-" n)))
-(macrolet ((make-insert-functions ()
+(cl-macrolet ((make-insert-functions ()
`(progn
,@(mapcar #'(lambda (command)
`(defun ,(bqn--make-key-command-sym (car command)) ()
diff --git a/editors/emacs/bqn-syntax.el b/editors/emacs/bqn-syntax.el
index 4dc06543..a1a18c8d 100644
--- a/editors/emacs/bqn-syntax.el
+++ b/editors/emacs/bqn-syntax.el
@@ -1,5 +1,6 @@
;;; -*- lexical-binding: t -*-
+(require 'cl-lib)
(require 'bqn-symbols)
(defface bqn-block-face
@@ -80,9 +81,9 @@
(defvar bqn--syntax-table
(let ((table (make-syntax-table)))
- (loop for s in bqn--symbols
- do (modify-syntax-entry (aref (second s) 0) "." table))
- (loop for s in (append "$%&*+-/<=>|" nil)
+ (cl-loop for s in bqn--symbols
+ do (modify-syntax-entry (aref (cl-second s) 0) "." table))
+ (cl-loop for s in (append "$%&*+-/<=>|" nil)
do (modify-syntax-entry s "." table))
(modify-syntax-entry ?\n ">" table)
(modify-syntax-entry ?# "<" table)