diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-04-29 09:08:19 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-04-29 09:08:19 -0700 |
| commit | 666293861985480bc658f9fa399009027bc39f1e (patch) | |
| tree | cbab6e4c77be3e5ee965b0e15b681b1030f2c3bb /admin | |
| parent | f1a3a7d6caeb3f250d338217dfd4c476e812bc6e (diff) | |
| parent | 0e8d452c1c166ff65a0325de23bc04b57aea68d8 (diff) | |
| download | emacs-666293861985480bc658f9fa399009027bc39f1e.tar.gz | |
Merge from origin/emacs-26
0e8d452 ; * doc/lispref/nonascii.texi (Coding System Basics): Fix gra...
25a2ff7 ; Add missing space in custom.texi
9ec18fb * admin/admin.el (set-version): Check for increase in version...
93912ba Be more careful about indent-sexp going over eol (Bug#35286)
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/admin.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/admin/admin.el b/admin/admin.el index 030bd54b521..d3a477fde80 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -138,10 +138,10 @@ Root must be the root of an Emacs source tree." (if (eq 2 (length newversion)) 0 1)))) (majorbump (and oldversion (not (equal oldmajor newmajor)))) (minorbump (and oldversion (not majorbump) - (or (not (equal (cadr oldversion) - (cadr newversion))) - (and (equal (cadr oldversion) (cadr newversion)) - (equal (nth 2 newversion) 50))))) + (or (not (equal (cadr oldversion) (cadr newversion))) + ;; Eg 26.2 -> 26.2.50. + (and (> (length newversion) + (length oldversion)))))) (newsfile (expand-file-name "etc/NEWS" root)) (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) (unless (> (length newversion) 2) ; pretest or release candidate? |