aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vms/make-mms-derivative.el18
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 @@
4 4
5;; Author: Thien-Thi Nguyen <ttn@gnu.org> 5;; Author: Thien-Thi Nguyen <ttn@gnu.org>
6;; Keywords: maint build vms mms makefile levitte autoconf war-is-a-lose 6;; Keywords: maint build vms mms makefile levitte autoconf war-is-a-lose
7;; Favorite-TV-Game-Show: L'Eredità
8 7
9;; This file is part of GNU Emacs. 8;; This file is part of GNU Emacs.
10 9
@@ -67,9 +66,6 @@
67 (cons (cons key newval) make-mms-derivative-data)) 66 (cons (cons key newval) make-mms-derivative-data))
68 (cdr (assq key make-mms-derivative-data)))) 67 (cdr (assq key make-mms-derivative-data))))
69 68
70(defun make-mms-derivative-write-under-root (rel-filename)
71 (write-file (expand-file-name rel-filename make-mms-derivative-root-dir)))
72
73(defmacro make-mms-derivative-progn (msg &rest body) 69(defmacro make-mms-derivative-progn (msg &rest body)
74 `(progn 70 `(progn
75 (message "(%s) %s" (point) ,msg) 71 (message "(%s) %s" (point) ,msg)
@@ -95,11 +91,11 @@
95 (setq raw-data (cons (list i line) raw-data))))) 91 (setq raw-data (cons (list i line) raw-data)))))
96 (kill-buffer wbuf) 92 (kill-buffer wbuf)
97 (set-buffer cur) 93 (set-buffer cur)
98 (mapcar '(lambda (ent) 94 (mapcar (lambda (ent)
99 (setcdr ent (mapconcat '(lambda (line) 95 (setcdr ent (mapconcat (lambda (line)
100 (concat line "\n")) 96 (concat line "\n"))
101 (cdr ent) 97 (cdr ent)
102 ""))) 98 "")))
103 raw-data) 99 raw-data)
104 (make-mms-derivative-data 'raw-data raw-data)) 100 (make-mms-derivative-data 'raw-data raw-data))
105 (load name)) 101 (load name))
@@ -126,7 +122,9 @@
126 (insert-file file) 122 (insert-file file)
127 (make-mms-derivative-load-edits-file edits-filename) 123 (make-mms-derivative-load-edits-file edits-filename)
128 (let ((out (make-mms-derivative-data 'write-under-root))) 124 (let ((out (make-mms-derivative-data 'write-under-root)))
129 (when out (make-mms-derivative-write-under-root out)) 125 (when out
126 (write-file
127 (expand-file-name rel-filename make-mms-derivative-root-dir)))
130 (kill-buffer buf) 128 (kill-buffer buf)
131 (unless out (message "Munging ... done"))))))) 129 (unless out (message "Munging ... done")))))))
132 130