|
64 | 64 | (defvar paredit-version)
|
65 | 65 | (defvar paredit-mode))
|
66 | 66 |
|
67 |
| -(require 'cl) |
| 67 | +(require 'cl-lib) |
68 | 68 | (require 'imenu)
|
69 | 69 |
|
70 | 70 | (declare-function lisp-fill-paragraph "lisp-mode" (&optional justify))
|
@@ -341,7 +341,7 @@ Called by `imenu--generic-function'."
|
341 | 341 | (backward-sexp))
|
342 | 342 | (if (char-equal ?) (char-after (point)))
|
343 | 343 | (backward-sexp)))
|
344 |
| - (destructuring-bind (def-beg . def-end) (bounds-of-thing-at-point 'sexp) |
| 344 | + (cl-destructuring-bind (def-beg . def-end) (bounds-of-thing-at-point 'sexp) |
345 | 345 | (if (char-equal ?^ (char-after def-beg))
|
346 | 346 | (progn (forward-sexp) (backward-sexp))
|
347 | 347 | (setq found? t)
|
@@ -563,14 +563,14 @@ locking in def* forms that are not at top level."
|
563 | 563 | (let ((changed nil))
|
564 | 564 | (let ((def (clojure-font-lock-def-at-point font-lock-beg)))
|
565 | 565 | (when def
|
566 |
| - (destructuring-bind (def-beg . def-end) def |
| 566 | + (cl-destructuring-bind (def-beg . def-end) def |
567 | 567 | (when (and (< def-beg font-lock-beg)
|
568 | 568 | (< font-lock-beg def-end))
|
569 | 569 | (setq font-lock-beg def-beg
|
570 | 570 | changed t)))))
|
571 | 571 | (let ((def (clojure-font-lock-def-at-point font-lock-end)))
|
572 | 572 | (when def
|
573 |
| - (destructuring-bind (def-beg . def-end) def |
| 573 | + (cl-destructuring-bind (def-beg . def-end) def |
574 | 574 | (when (and (< def-beg font-lock-end)
|
575 | 575 | (< font-lock-end def-end))
|
576 | 576 | (setq font-lock-end def-end
|
@@ -677,8 +677,8 @@ This function also returns nil meaning don't specify the indentation."
|
677 | 677 | (progn (forward-sexp 1) (point))))
|
678 | 678 | (open-paren (elt state 1))
|
679 | 679 | (method nil)
|
680 |
| - (function-tail (first |
681 |
| - (last |
| 680 | + (function-tail (car |
| 681 | + (reverse |
682 | 682 | (split-string (substring-no-properties function) "/")))))
|
683 | 683 | (setq method (get (intern-soft function-tail) 'clojure-indent-function))
|
684 | 684 | (cond ((member (char-after open-paren) '(?\[ ?\{))
|
@@ -771,7 +771,7 @@ move upwards in an sexp to check for contextual indenting."
|
771 | 771 | "Call `put-clojure-indent' on a series, KVS."
|
772 | 772 | `(progn
|
773 | 773 | ,@(mapcar (lambda (x) `(put-clojure-indent
|
774 |
| - (quote ,(first x)) ,(second x))) |
| 774 | + (quote ,(car x)) ,(cadr x))) |
775 | 775 | kvs)))
|
776 | 776 |
|
777 | 777 | (defun add-custom-clojure-indents (name value)
|
@@ -1079,7 +1079,6 @@ Returns a list pair, e.g. (\"defn\" \"abc\") or (\"deftest\" \"some-test\")."
|
1079 | 1079 |
|
1080 | 1080 | ;; Local Variables:
|
1081 | 1081 | ;; coding: utf-8
|
1082 |
| -;; byte-compile-warnings: (not cl-functions) |
1083 | 1082 | ;; indent-tabs-mode: nil
|
1084 | 1083 | ;; End:
|
1085 | 1084 |
|
|
0 commit comments