aboutsummaryrefslogtreecommitdiffstats
path: root/admin/admin.el
diff options
context:
space:
mode:
Diffstat (limited to 'admin/admin.el')
-rw-r--r--admin/admin.el11
1 files changed, 4 insertions, 7 deletions
diff --git a/admin/admin.el b/admin/admin.el
index 8048ccc78e0..44fbd8ed543 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,6 +1,6 @@
1;;; admin.el --- utilities for Emacs administration 1;;; admin.el --- utilities for Emacs administration
2 2
3;; Copyright (C) 2001 Free Software Foundation, Inc. 3;; Copyright (C) 2001, 2005 Free Software Foundation, Inc.
4 4
5;; This file is part of GNU Emacs. 5;; This file is part of GNU Emacs.
6 6
@@ -21,8 +21,8 @@
21 21
22;;; Commentary: 22;;; Commentary:
23 23
24;; add-release-log add ``Version X released'' change log entries 24;; add-release-logs Add ``Version X released'' change log entries.
25;; set-version change Emacs version number in source tree. 25;; set-version Change Emacs version number in source tree.
26 26
27;;; Code: 27;;; Code:
28 28
@@ -43,7 +43,6 @@ Signal an error if the program returns with a non-zero exit status."
43 (forward-line 1)) 43 (forward-line 1))
44 (nreverse lines))))) 44 (nreverse lines)))))
45 45
46
47(defun add-release-logs (root version) 46(defun add-release-logs (root version)
48 "Add \"Version VERSION released.\" change log entries in ROOT. 47 "Add \"Version VERSION released.\" change log entries in ROOT.
49Root must be the root of an Emacs source tree." 48Root must be the root of an Emacs source tree."
@@ -51,8 +50,8 @@ Root must be the root of an Emacs source tree."
51 (setq root (expand-file-name root)) 50 (setq root (expand-file-name root))
52 (unless (file-exists-p (expand-file-name "src/emacs.c" root)) 51 (unless (file-exists-p (expand-file-name "src/emacs.c" root))
53 (error "%s doesn't seem to be the root of an Emacs source tree" root)) 52 (error "%s doesn't seem to be the root of an Emacs source tree" root))
53 (require 'add-log)
54 (let* ((logs (process-lines "find" root "-name" "ChangeLog")) 54 (let* ((logs (process-lines "find" root "-name" "ChangeLog"))
55 (require 'add-log)
56 (entry (format "%s %s <%s>\n\n\t* Version %s released.\n\n" 55 (entry (format "%s %s <%s>\n\n\t* Version %s released.\n\n"
57 (funcall add-log-time-format) 56 (funcall add-log-time-format)
58 (or add-log-full-name (user-full-name)) 57 (or add-log-full-name (user-full-name))
@@ -64,7 +63,6 @@ Root must be the root of an Emacs source tree."
64 (goto-char (point-min)) 63 (goto-char (point-min))
65 (insert entry))))) 64 (insert entry)))))
66 65
67
68(defun set-version-in-file (root file version rx) 66(defun set-version-in-file (root file version rx)
69 (find-file (expand-file-name file root)) 67 (find-file (expand-file-name file root))
70 (goto-char (point-min)) 68 (goto-char (point-min))
@@ -72,7 +70,6 @@ Root must be the root of an Emacs source tree."
72 (error "Version not found in %s" file)) 70 (error "Version not found in %s" file))
73 (replace-match (format "%s" version) nil nil nil 1)) 71 (replace-match (format "%s" version) nil nil nil 1))
74 72
75
76(defun set-version (root version) 73(defun set-version (root version)
77 "Set Emacs version to VERSION in relevant files under ROOT. 74 "Set Emacs version to VERSION in relevant files under ROOT.
78Root must be the root of an Emacs source tree." 75Root must be the root of an Emacs source tree."