From 68504b7a8f2ad592c263b009d0b8422857a5a108 Mon Sep 17 00:00:00 2001
From: "Tom Breton (Tehom)" <tehom@panix.com>
Date: Fri, 12 Nov 2010 17:23:04 -0500
Subject: [PATCH] Cleanups after changeover

---
 elinstall.el | 53 +++++++++++++++++++++++++----------------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/elinstall.el b/elinstall.el
index b25ae15..c59584f 100644
--- a/elinstall.el
+++ b/elinstall.el
@@ -181,15 +181,16 @@ which lists the file name and which functions are in it, etc."
 (defun elinstall-insert-autoload-section (text form &optional comment-string)
    "Insert TEXT into current buffer as an autoload section"
    
-   ;; Insert the section-header line which lists the file name
-   ;; and which functions are in it, etc.
+   (let* ( ;; This does something in Lucid Emacs.
+	    (print-length nil)
+	    (print-readably t)	 
+	    (float-output-format nil))
    
-   (elinstall-insert-section-header (current-buffer) form)
-
-   (when comment-string
-      (insert ";;; " comment-string "\n"))
-   (insert text)
-   (insert generate-autoload-section-trailer))
+      (elinstall-insert-section-header (current-buffer) form)
+      (when comment-string
+	 (insert ";;; " comment-string "\n"))
+      (insert text)
+      (insert generate-autoload-section-trailer)))
 
 ;;;_     , elinstall-make-autoload-action
 (defun elinstall-make-autoload-action (buf def-file load-path-element full-path)
@@ -267,7 +268,6 @@ which lists the file name and which functions are in it, etc."
 	       `(add-file-autoloads
 		   ,def-file
 		   ,relative-name
-		   ,load-path-element
 		   ,full-path
 		   ,(with-current-buffer outbuf (buffer-string))
 		   ,autoloads-done))
@@ -280,7 +280,7 @@ which lists the file name and which functions are in it, etc."
 
 (defun elinstall-generate-file-autoloads 
    (relative-name full-name text autoloads-done)
-  "Insert at point a loaddefs autoload section for FILE.
+   "Insert at point a loaddefs autoload section for FILE.
 Autoloads are generated for defuns and defmacros in FILE
 marked by `generate-autoload-cookie' (which see).
 If FILE is being visited in a buffer, the contents of the buffer
@@ -289,23 +289,20 @@ Return non-nil in the case where no autoloads were added at point.
 
 FULL-NAME is the absolute name of the file.
 RELATIVE-NAME is its name respective to some component of load-path."
-  (let* ( ;; This does something in Lucid Emacs.
-	  (print-length nil)
-	  (print-readably t)	 
-	  (float-output-format nil))
-
-     (if (not (equal text ""))
-	(elinstall-insert-autoload-section
-	   text
-	   (list 'autoloads 
-	      autoloads-done
-	      relative-name
-	      (autoload-trim-file-name full-name)
-	      (nth 5 (file-attributes full-name)))
-	   (concat
-	      "Generated autoloads from " 
-	      (autoload-trim-file-name full-name)))
-	t)))
+   (if (not (equal text ""))
+      ;; Insert the section-header line which lists the file name and
+      ;; which functions are in it, etc.
+      (elinstall-insert-autoload-section
+	 text
+	 (list 'autoloads 
+	    autoloads-done
+	    relative-name
+	    (autoload-trim-file-name full-name)
+	    (nth 5 (file-attributes full-name)))
+	 (concat
+	    "Generated autoloads from " 
+	    (autoload-trim-file-name full-name)))
+      t))
 
 ;;;_     , elinstall-deffile-insert-autoloads
 (defun elinstall-deffile-insert-autoloads (file args)
@@ -454,7 +451,7 @@ Return filename if this action belongs in the no-autoload section."
 	 (add-file-autoloads
 	    (elinstall-deffile-insert-autoloads
 	       (third action)
-	       (nthcdr 4 action)))
+	       (nthcdr 3 action)))
 	 
 	 (add-to-load-path
 	    (elinstall-deffile-insert-add-to-path
-- 
2.11.4.GIT