From: Tom Breton (Tehom) <tehom@panix.com>
Date: Fri, 24 Dec 2010 21:03:35 +0000 (-0500)
Subject: Removed an obsolete `force' argument.  Changed comments.
X-Git-Url: https://repo.or.cz/w/elinstall.git/commitdiff_plain/c2b9783c644bb7d51c53f4439a04891207a483e7

Removed an obsolete `force' argument.  Changed comments.
---

diff --git a/elinstall.el b/elinstall.el
index 8a7956b..1075ae9 100644
--- a/elinstall.el
+++ b/elinstall.el
@@ -648,8 +648,7 @@ Return filename if this action belongs in the no-autoload section."
 
 ;;Adapted from autoload.el `update-directory-autoloads'.
 
-(defun elinstall-update-deffile (target actions &optional
-				   use-load-path force)
+(defun elinstall-update-deffile (target actions &optional use-load-path)
   "\
 Update file TARGET with current autoloads as specified by ACTIONS.
 Also remove any old definitions pointing to libraries that can no
@@ -662,9 +661,6 @@ USE-LOAD-PATH is a list to use as load-path.  It should include
 any new load-path that we are arranging to create.  If it's not given,
 load-path itself is used.
 
-If FORCE is `t', do it regardless of timestamps etc. (Not implemented)
-Other non-nil cases of FORCE are reserved for future development.
-
 This uses `update-file-autoloads' (which see) to do its work.
 In an interactive call, you must give one argument, the name
 of a single directory."
@@ -710,12 +706,18 @@ of a single directory."
 			  ((file-path
 			      (locate-library file nil use-load-path)))
 			  (cond
+			     ;;$$MAKE ME SAFER Also check normal
+			     ;;load-path in case `use-load-path' is
+			     ;;too restrictive.
+			     ;;$$MAKE ME SAFER Don't do this for a
+			     ;;file we are inserting.  Need a boolean
+			     ;;return for checking that.
 			     ;;File doesn't exist, so remove its
 			     ;;section.
 			     ((not file-path)
 				(autoload-remove-section 
 				   (match-beginning 0)))
-
+			     ;;$$IMPROVE ME  Consult elinstall-proceed-p.
 			     ;; File hasn't changed, so do nothing.
 			     ((equal 
 				 (nth 4 form) 
@@ -756,7 +758,9 @@ FORCE and USE-LOAD-PATH have the same meaning as in
 	   (let*
 	      ((deffile (car segment)))
 	      (if (stringp deffile)
-		 (elinstall-update-deffile deffile (cdr segment) force
+		 (elinstall-update-deffile 
+		    deffile 
+		    (cdr segment) 
 		    use-load-path))))
       segment-list))