]> code.delx.au - dotemacs/blobdiff - init.el
Document git-grep replace
[dotemacs] / init.el
diff --git a/init.el b/init.el
index 85aaa337bad00613f7bb7848a98677a2d69aa60d..1f3865e786b272210475af67b0e93cb258e6c249 100644 (file)
--- a/init.el
+++ b/init.el
@@ -1,13 +1,14 @@
 ;;; -*- lexical-binding: t -*-
 
-(require 'cl-lib)
+(require 'seq)
 
 (defvar my/original-load-path load-path)
 
 (defun my/add-to-load-path (dirname)
-  (and (string-match-p "^[^\\.]" dirname)
-       (file-accessible-directory-p dirname)
-       (cl-remove-if-not (lambda (file) (string-match-p "\\.el$" file)) (directory-files dirname))
+  (and (file-accessible-directory-p dirname)
+       (seq-filter (lambda (file)
+                     (string-match-p "\\.el$" file))
+                   (directory-files dirname))
        (add-to-list 'load-path dirname)))
 
 (defun my/setup-load-path ()
 
   (my/add-to-load-path "~/.emacs.d/lisp")
 
-  (dolist (name (directory-files "~/.emacs.d/packages"))
-    (let ((dirname (concat "~/.emacs.d/packages/" name)))
-      (my/add-to-load-path dirname)
-      (my/add-to-load-path (concat dirname "/lisp"))))
+  (dolist (dirname (directory-files "~/.emacs.d/packages" 'full "^[^\\.]"))
+    (my/add-to-load-path dirname)
+    (my/add-to-load-path (concat dirname "/lisp")))
 
   (message "Set load-path: %S" load-path))
 
@@ -26,7 +26,6 @@
 (my/setup-load-path)
 
 (load-library "my-backups")
-(load-library "my-completion")
 (load-library "my-direx")
 (load-library "my-editing-defuns")
 (load-library "my-file-modes")
@@ -40,6 +39,7 @@
 (load-library "my-recentf")
 (load-library "my-scratch")
 (load-library "my-shackle")
+(load-library "my-swiper")
 (load-library "my-vc")
 
 (message "Successfully loaded init.el")