[Emacs-diffs] /srv/bzr/emacs/trunk r110404: Improve cusver-check's handling of the version number

[Glenn Morris]

------------------------------------------------------------
revno: 110404
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-06 17:54:36 -0700
message:
  Improve cusver-check's handling of the version number
  
  * admin/admin.el (cusver-new-version): Set default.
  (cusver-check): Improve interactive argument reading.
modified:
  admin/ChangeLog
  admin/admin.el

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2012-10-06 21:15:03 +0000
+++ b/admin/ChangeLog   2012-10-07 00:54:36 +0000
@@ -1,3 +1,8 @@
+2012-10-07  Glenn Morris  <address@hidden>
+
+       * admin.el (cusver-new-version): Set default.
+       (cusver-check): Improve interactive argument reading.
+
 2012-10-06  Glenn Morris  <address@hidden>
 
        * admin.el (cusver-new-version): New variable.

=== modified file 'admin/admin.el'
--- a/admin/admin.el    2012-10-06 21:15:03 +0000
+++ b/admin/admin.el    2012-10-07 00:54:36 +0000
@@ -442,8 +442,8 @@
                                     ))
                 "{}" "+"))
 
-; FIXME Calculate default based on running emacs-version.
-(defvar cusver-new-version nil
+(defvar cusver-new-version (format "%s.%s" emacs-major-version
+                                  (1+ emacs-minor-version))
   "Version number that new defcustoms should have.")
 
 ;; TODO do something about renamed variables with aliases to the old name?
@@ -515,7 +515,11 @@
 
 Note that a :version tag should also be added if the value of a defcustom
 changes (in a non-trivial way).  This function does not check for that."
-  (interactive "DNew Lisp directory: \nDOld Lisp directory: \nsNew version 
number: ")
+  (interactive (list (read-directory-name "New Lisp directory: ")
+                    (read-directory-name "Old Lisp directory: ")
+                    (number-to-string
+                     (read-number "New version number: "
+                                  (string-to-number cusver-new-version)))))
   (or (file-directory-p (setq newdir (expand-file-name newdir)))
       (error "Directory `%s' not found" newdir))
   (or (file-directory-p (setq olddir (expand-file-name olddir)))