* lisp/initz-list.el (initz-list-byte-compile-file): Byte-Compile

[elisp/initz.git] / lisp / initz.el

diff --git a/lisp/initz.el b/lisp/initz.el
index 1780edf..29b136f 100644 (file)
--- a/lisp/initz.el
+++ b/lisp/initz.el
@@ -79,11 +79,10 @@ If ARG is specified, don't display code name."
 
 (defconst initz-init-alist
   `((argument . ("argument"
-                ,(mapconcat
-                  (function (lambda (arg)
-                              (initz-trim-separator arg)))
-                  (cdr command-line-args)
-                  initz-separator-string)))
+                ,(mapconcat #'(lambda (arg)
+                                (initz-trim-separator arg))
+                            (cdr command-line-args)
+                            initz-separator-string)))
     ( flavor . ("flavor" ,initz-flavor))
     (host . ("host" ,(system-name)))
     (system . ("system" ,(symbol-name system-type)))
@@ -95,16 +94,14 @@ If ARG is specified, don't display code name."
        (count 0))
     (unless (null list)
       (catch 'found
-       (mapc
-        (function (lambda (temp)
-                    (if (eq type temp)
-                        (let ((elem (nth count list)))
-                          (when (and (eq type 'prefix)
-                                   (not (string= elem initz-null-string)))
-                              (setq elem (concat initz-separator-string
-                                                 elem)))
-                          (throw 'found elem))
-                      (setq count (incf count)))))
+       (mapc #'(lambda (temp)
+                 (if (eq type temp)
+                     (let ((elem (nth count list)))
+                       (when (and (eq type 'prefix)
+                                  (not (string= elem initz-null-string)))
+                         (setq elem (concat initz-separator-string elem)))
+                       (throw 'found elem))
+                   (setq count (incf count))))
         '(dir prefix))
        nil))))
 
@@ -131,11 +128,10 @@ If ARG is specified, don't display code name."
 (defun initz-get-kind (file)
   "Return the kind of FILE."
   (catch 'found
-    (mapc
-     (function (lambda (kind)
-                (when (string-match (initz-directory kind) file)
-                  (throw 'found kind))))
-     '(startup flavor))
+    (mapc #'(lambda (kind)
+             (when (string-match (initz-directory kind) file)
+               (throw 'found kind)))
+         '(startup flavor))
     nil))
 
 (defun initz-get-dir (file)
@@ -149,11 +145,10 @@ If ARG is specified, don't display code name."
          (throw 'found 'misc)
        (when (string-match (concat directory "\\(.+\\)") file)
          (let ((dir (substring (match-string 1 file) 1)))
-           (mapc
-            (function (lambda (alist)
-                        (when (string= (nth 0 (cdr alist)) dir)
-                          (throw 'found (car alist)))))
-            initz-init-alist))))
+           (mapc #'(lambda (alist)
+                     (when (string= (nth 0 (cdr alist)) dir)
+                       (throw 'found (car alist))))
+                 initz-init-alist))))
       nil)))
 
 (defun initz-get-correspondence-file (init-file)
@@ -188,23 +183,21 @@ If ARG is specified, don't display code name."
 
 (defun initz-make-directory (sym)
   "Make SYM's directory."
-  (mapc
-   (function (lambda (kind)
-              (let ((directory (expand-file-name
-                                (initz-get-init-value sym 'dir)
-                                (initz-directory kind))))
-                (unless (file-directory-p directory)
-                  (make-directory directory t)))))
-   '(startup flavor)))
+  (mapc #'(lambda (kind)
+           (let ((directory (expand-file-name
+                             (initz-get-init-value sym 'dir)
+                             (initz-directory kind))))
+             (unless (file-directory-p directory)
+               (make-directory directory t))))
+       '(startup flavor)))
 
 (defun initz-make-directories ()
   "Make initz directories."
   (interactive)
-  (mapc
-   (function (lambda (alist)
-              (let ((sym (car alist)))
-                (initz-make-directory sym))))
-   initz-init-alist))
+  (mapc #'(lambda (alist)
+           (let ((sym (car alist)))
+             (initz-make-directory sym)))
+       initz-init-alist))
 
 (defun initz-delete-file (flavor-file)
   "Delete the FLAVOR-FILE when startup-file was deleted."
@@ -215,20 +208,18 @@ If ARG is specified, don't display code name."
 (defun initz-delete-files (sym)
   "Delete files in the SYM's directory when startup-file was deleted."
   (let ((flavor-files (initz-get-files 'flavor sym)))
-    (mapc
-     (function (lambda (flavor-file)
-                (initz-delete-file flavor-file)))
-     flavor-files)))
+    (mapc #'(lambda (flavor-file)
+             (initz-delete-file flavor-file))
+         flavor-files)))
 
 (defun initz-delete ()
   "Delete the initz startup files."
   (interactive)
   (initz-make-directories)
-  (mapc
-   (function (lambda (alist)
-              (let ((sym (car alist)))
-                (initz-delete-files sym))))
-   initz-init-alist))
+  (mapc #'(lambda (alist)
+           (let ((sym (car alist)))
+             (initz-delete-files sym)))
+       initz-init-alist))
 
 (defun initz-compile-file (startup-file)
   "Compile the STARTUP-FILE."
@@ -250,10 +241,9 @@ If ARG is specified, don't display code name."
   "Compile files in the SYM's directory."
   (let ((startup-files (initz-get-files 'startup sym))
        compiled-files)
-    (mapc
-     (function (lambda (startup-file)
-                (initz-compile-file startup-file)))
-     startup-files)
+    (mapc #'(lambda (startup-file)
+             (initz-compile-file startup-file))
+         startup-files)
     (setq compiled-files (directory-files
                          (initz-startup-directory sym) nil "\\.elc$"))
     (install-files compiled-files (initz-startup-directory sym)
@@ -264,11 +254,10 @@ If ARG is specified, don't display code name."
   (interactive)
   (initz-delete)
   (setq initz-compile-error-files nil)
-  (mapc
-   (function (lambda (alist)
-              (let ((sym (car alist)))
-                (initz-compile-files sym))))
-   initz-init-alist)
+  (mapc #'(lambda (alist)
+           (let ((sym (car alist)))
+             (initz-compile-files sym)))
+       initz-init-alist)
   (and initz-compile-error-files (eq initz-verbose 'errors)
        (initz-error)))
 
@@ -305,10 +294,9 @@ If ARG is specified, don't display code name."
 (defun initz-load-files (sym)
   "Load files in the SYM's directory."
   (let ((flavor-files (initz-get-files 'flavor sym)))
-    (mapc
-     (function (lambda (flavor-file)
-                (initz-load-file flavor-file)))
-     flavor-files)))
+    (mapc #'(lambda (flavor-file)
+             (initz-load-file flavor-file))
+         flavor-files)))
 
 (defun initz-load ()
   "Load the initz startup files."
@@ -319,11 +307,10 @@ If ARG is specified, don't display code name."
   ;; tricky
   (setq initz-load-list-internal initz-load-list)
   (setq initz-ignore-list-internal initz-ignore-list)
-  (mapc
-   (function (lambda (alist)
-              (let ((sym (car alist)))
-                (initz-load-files sym))))
-   initz-init-alist)
+  (mapc #'(lambda (alist)
+           (let ((sym (car alist)))
+             (initz-load-files sym)))
+       initz-init-alist)
   (and initz-load-error-files (eq initz-verbose 'errors)
        (initz-error)))