el/dot-emacs.el: Use the older names for `cl' functions and macros.

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 2c829c820ad78f159660e5556b913ab3b97db50c..a74b693f88c2afeb0abb63a8c52712e1306a1605 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1061,8 +1061,8 @@ (eval-after-load 'nnimap
 (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))
 (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.
     ad-do-it))
 
 ;; Preferred programs.


@@ -1547,8 +1547,8 @@ (eval-after-load 'ps-print
                        (line-height . 10.55)
                        (space-width . 5.1)
                        (avg-char-width . 5.1)))
                        (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
 
 ;; 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 @@ (defun mdw-merge-style-alists (first second)
        (push item output)))
     (nreverse output)))
 
        (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
   "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 @@ (defadvice common-lisp-loop-part-indentation
               (eq lisp-indent-backquote-substitution-mode 'corrected))
       (save-excursion
        (goto-char (elt state 1))
               (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)
                 (cond ((eq (char-before) ?,) -1)
                       ((and (eq (char-before) ?@)
                             (progn (backward-char)