From: Glenn Morris <rgm@gnu.org>
Date: Sat, 9 Mar 2013 20:19:41 +0000 (-0800)
Subject: * admin/admin.el (add-release-logs): Provide interactive defaults.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~585^2~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8c39e8217487c352f824c7770430170a877cec07;p=emacs.git

* admin/admin.el (add-release-logs): Provide interactive defaults.
Allow specification of the release date.
---

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6a636091a7c..a47d0d3c2dc 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-09  Glenn Morris  <rgm@gnu.org>
+
+	* admin.el (add-release-logs): Provide interactive defaults.
+	Allow specification of the release date.
+
 2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* notes/unicode: Add notes about Emacs source file encoding.
diff --git a/admin/admin.el b/admin/admin.el
index e815dfade47..e7ef222f424 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -28,25 +28,32 @@
 
 (defvar add-log-time-format)		; in add-log
 
-(defun add-release-logs (root version)
+(defun add-release-logs (root version &optional date)
   "Add \"Version VERSION released.\" change log entries in ROOT.
-Root must be the root of an Emacs source tree."
-  (interactive "DEmacs root directory: \nNVersion number: ")
+Root must be the root of an Emacs source tree.
+Optional argument DATE is the release date, default today."
+  (interactive (list (read-directory-name "Emacs root directory: ")
+		     (read-string "Version number: "
+				  (format "%s.%s" emacs-major-version
+					  emacs-minor-version))
+		     (read-string "Release date: "
+				  (progn (require 'add-log)
+					 (funcall add-log-time-format)))))
   (setq root (expand-file-name root))
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
     (error "%s doesn't seem to be the root of an Emacs source tree" root))
   (require 'add-log)
+  (or date (setq date (funcall add-log-time-format)))
   (let* ((logs (process-lines "find" root "-name" "ChangeLog"))
 	 (entry (format "%s  %s  <%s>\n\n\t* Version %s released.\n\n"
-			(funcall add-log-time-format)
+			date
 			(or add-log-full-name (user-full-name))
 			(or add-log-mailing-address user-mail-address)
 			version)))
     (dolist (log logs)
-      (unless (string-match "/gnus/" log)
-	(find-file log)
-	(goto-char (point-min))
-	(insert entry)))))
+      (find-file log)
+      (goto-char (point-min))
+      (insert entry))))
 
 (defun set-version-in-file (root file version rx)
   (find-file (expand-file-name file root))