merge trunk

1 files changed, 21 insertions, 8 deletions

diff --git a/admin/admin.el b/admin/admin.el
index e815dfade47..fc793c17bd2 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -28,25 +28,38 @@
 
 (defvar add-log-time-format)            ; in add-log
 
-(defun add-release-logs (root version)
+;; Does this information need to be in every ChangeLog, as opposed to
+;; just the top-level one?  Only if you allow changes the same
+;; day as the release.
+;; http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00161.html
+(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)
+                                         (let ((add-log-time-zone-rule t))
+                                           (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 (let ((add-log-time-zone-rule t))
+                        (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))