X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/9749c2677b05e3ae21f1f06df2596a7436a468fc..c996768f3e4bced81b26981a5813a516774cdb70:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index da7d116..b78c03c 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -33,7 +33,7 @@
     (if (file-exists-p boot)
 	(load boot))))
 
-(require 'cl)
+(require 'cl-lib)
 (require 'dot-emacs)
 
 (unless (mdw-emacs-version-p 25)
@@ -520,8 +520,8 @@
 		    ("application/x-pdf" "\\.pdf\\'" ("xdg-open" file) nil))))
      (dolist (e entries)
        (setq w3m-content-type-alist
-	       (cons e (remove* (car e) w3m-content-type-alist
-				:key #'car :test #'string=))))))
+	       (cons e (cl-remove (car e) w3m-content-type-alist
+				  :key #'car :test #'string=))))))
 
 (setq w3-do-incremental-display t
       w3-use-menus '(file edit view go bookmark options
@@ -813,10 +813,10 @@
 
 (eval-after-load "hippie-exp"
   '(setq hippie-expand-try-functions-list
-	   (remove-if (lambda (name)
-			(memq name '(try-expand-list
-				     try-expand-list-all-buffers)))
-		      hippie-expand-try-functions-list)))
+	   (cl-remove-if (lambda (name)
+			   (memq name '(try-expand-list
+					try-expand-list-all-buffers)))
+			 hippie-expand-try-functions-list)))
 
 (autoload 'dired-jump "dired-x")
 (autoload 'dired-jump-other-window "dired-x")
@@ -909,9 +909,9 @@
 
 (setq completion-ignored-extensions
 	(append `(".hc" ".hi") completion-ignored-extensions))
-(dolist (dir (remove-if-not (lambda (ext)
-			      (= (aref ext (- (length ext) 1)) ?/))
-			    completion-ignored-extensions))
+(dolist (dir (cl-remove-if-not (lambda (ext)
+				 (= (aref ext (- (length ext) 1)) ?/))
+			       completion-ignored-extensions))
   (if (/= (aref dir 0) ?/)
       (setq completion-ignored-extensions
 	      (cons (concat "/" dir)