(make-mms-derivative-write-under-root): Delete func.

(make-mms-derivative-progn): Don't quote lambda forms.
(make-mms-derivative): Inline make-mms-derivative-write-under-root.

1 files changed, 8 insertions, 10 deletions

diff --git a/vms/make-mms-derivative.el b/vms/make-mms-derivative.el
index 666ca4ae657..faf2c9ee9bf 100644
--- a/vms/make-mms-derivative.el
+++ b/vms/make-mms-derivative.el
@@ -4,7 +4,6 @@
 
 ;; Author: Thien-Thi Nguyen <ttn@gnu.org>
 ;; Keywords: maint build vms mms makefile levitte autoconf war-is-a-lose
-;; Favorite-TV-Game-Show: L'Eredità
 
 ;; This file is part of GNU Emacs.
 
@@ -67,9 +66,6 @@
             (cons (cons key newval) make-mms-derivative-data))
     (cdr (assq key make-mms-derivative-data))))
 
-(defun make-mms-derivative-write-under-root (rel-filename)
-  (write-file (expand-file-name rel-filename make-mms-derivative-root-dir)))
-
 (defmacro make-mms-derivative-progn (msg &rest body)
   `(progn
      (message "(%s) %s" (point) ,msg)
@@ -95,11 +91,11 @@
 	  (setq raw-data (cons (list i line) raw-data)))))
     (kill-buffer wbuf)
     (set-buffer cur)
-    (mapcar '(lambda (ent)
-	       (setcdr ent (mapconcat '(lambda (line)
-					 (concat line "\n"))
-				      (cdr ent)
-				      "")))
+    (mapcar (lambda (ent)
+              (setcdr ent (mapconcat (lambda (line)
+                                       (concat line "\n"))
+                                     (cdr ent)
+                                     "")))
 	    raw-data)
     (make-mms-derivative-data 'raw-data raw-data))
   (load name))
@@ -126,7 +122,9 @@
         (insert-file file)
         (make-mms-derivative-load-edits-file edits-filename)
         (let ((out (make-mms-derivative-data 'write-under-root)))
-          (when out (make-mms-derivative-write-under-root out))
+          (when out
+            (write-file
+             (expand-file-name rel-filename make-mms-derivative-root-dir)))
           (kill-buffer buf)
           (unless out (message "Munging ... done")))))))