From 5407f8d23491f3e7886865facc0ae6446142ba48 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 6 Oct 2012 17:54:36 -0700 Subject: [PATCH] Improve cusver-check's handling of the version number * admin/admin.el (cusver-new-version): Set default. (cusver-check): Improve interactive argument reading. --- admin/ChangeLog | 5 +++++ admin/admin.el | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 82a01887b57..7d4921887ce 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2012-10-07 Glenn Morris + + * admin.el (cusver-new-version): Set default. + (cusver-check): Improve interactive argument reading. + 2012-10-06 Glenn Morris * admin.el (cusver-new-version): New variable. diff --git a/admin/admin.el b/admin/admin.el index 60a09a1e2f2..3e3fbba7202 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -442,8 +442,8 @@ If optional OLD is non-nil, also include defvars." )) "{}" "+")) -; 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 @@ just converting a defvar to a defcustom does not require a :version bump. 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))) -- 2.39.5