From a151a6557644e8a5196b93981ab523d20082e444 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 25 Mar 2023 13:04:03 +0000 Subject: [PATCH] el/dot-emacs.el: Use the older names for `cl' functions and macros. --- el/dot-emacs.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/el/dot-emacs.el b/el/dot-emacs.el index 2c829c8..a74b693 100644 --- a/el/dot-emacs.el +++ b/el/dot-emacs.el @@ -1061,8 +1061,8 @@ Use this to arrange for per-server settings." (defadvice gnus-other-frame (around mdw-hack-frame-width compile activate) "Always arrange for mail/news frames to be 80 columns wide." (let ((default-frame-alist (cons `(width . ,(+ 80 mdw-frame-width-fudge)) - (cl-delete 'width default-frame-alist - :key #'car)))) + (delete* 'width default-frame-alist + :key #'car)))) ad-do-it)) ;; Preferred programs. @@ -1547,8 +1547,8 @@ case." (line-height . 10.55) (space-width . 5.1) (avg-char-width . 5.1))) - (cl-remove 'CourierCondensed ps-font-info-database - :key #'car))))) + (remove* 'CourierCondensed ps-font-info-database + :key #'car))))) ;; Arrange to strip overlays from the buffer before we print . This will ;; prevent `flyspell' from interfering with the printout. (It would be less @@ -2305,7 +2305,7 @@ indentation anyway." (push item output))) (nreverse output))) -(cl-defmacro mdw-define-c-style (name (&optional parent) &rest assocs) +(defmacro* mdw-define-c-style (name (&optional parent) &rest assocs) "Define a C style, called NAME (a symbol) based on PARENT, setting ASSOCs. A function, named `mdw-define-c-style/NAME', is defined to actually install the style using `c-add-style', and added to the hook @@ -4855,7 +4855,7 @@ align the other subforms beneath it. Otherwise, indent them (eq lisp-indent-backquote-substitution-mode 'corrected)) (save-excursion (goto-char (elt state 1)) - (cl-incf loop-indentation + (incf loop-indentation (cond ((eq (char-before) ?,) -1) ((and (eq (char-before) ?@) (progn (backward-char) -- 2.11.0