From 4056240b4ce2bed69ecf938d944305e23b1d5ddd Mon Sep 17 00:00:00 2001 From: "Tom Breton (Tehom)" Date: Fri, 12 Nov 2010 20:35:43 -0500 Subject: [PATCH] Split the file and dir entry points: just autoloads / full. --- elinstall.el | 65 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/elinstall.el b/elinstall.el index bb69278..0a90840 100644 --- a/elinstall.el +++ b/elinstall.el @@ -1134,10 +1134,9 @@ Recurse just if RECURSE-DIRS-P" (mapcar #'car (elinstall-stages->build-deffiles stages))) - ;;;_ , elinstall-x (defun elinstall-x (dir spec &optional force) - "" + "High-level worker function to install elisp files." (let* ( ;;This is just the default deffile, spec can override it. @@ -1201,44 +1200,52 @@ development." ;;;_ . elinstall-update-directory-autoloads -;;$$SPLIT ME - one to just classically update autoloads, one to -;;install a file. -;;$$TEST ME + +;;The control variables and values of `force' that would stop other +;;actions don't exist yet. Similarly for +;;`elinstall-update-file-autoloads'. ;;;###autoload (defun elinstall-update-directory-autoloads (dir) - "" + "Update autoloads for directory DIR" - (interactive "DInstall all elisp files from directory: ") + (interactive "DUpdate autoloads for all elisp files from directory: ") + (elinstall-x + dir + `(control compile-p nil + (dir ".")))) - - (let - ((def-file-name - (elinstall-expand-deffile-name - generated-autoload-file))) - - (elinstall-x +;;;_ . elinstall-update-directory +;;;###autoload +(defun elinstall-update-directory (dir) + "Update autoloads for directory DIR" + + (interactive "DInstall all elisp files from directory: ") + (elinstall-x dir - `(def-file ,def-file-name (nil) (dir "."))))) - - + `(def-file ,def-file-name (nil) + (dir ".")))) ;;;_ . elinstall-update-file-autoloads -;;$$SPLIT ME - one to just classically update autoloads, one to -;;install a file. -;;$$TEST ME ;;;###autoload (defun elinstall-update-file-autoloads (file) - "" + "Update autoloads for elisp file FILE" + + (interactive "fUpdate autoloads for elisp file: ") + (elinstall-x + file + `(control compile-p nil + (file ,file)))) + +;;;_ . elinstall-update-file +;;;###autoload +(defun elinstall-update-file (file) + "Install elisp file FILE" (interactive "fInstall elisp file: ") - (let - ((def-file-name - ;;This is the default. File local vars can override it. - (elinstall-expand-deffile-name - generated-autoload-file))) - (elinstall-x - file - `(def-file ,def-file-name (nil) (file ,file))))) + (elinstall-x + file + `(file ,file))) + ;;;_. Footers ;;;_ , Provides -- 2.11.4.GIT