Fixups after merge from emacs-25

* etc/NEWS: Remove stray entry.
* etc/NEWS.25: Copy from Emacs emacs-25 etc/NEWS.
* lisp/textmodes/rst.el (rst-package-emacs-version-alist):
Make it nondecreasing.
This commit is contained in:
Paul Eggert 2017-03-19 12:39:16 -07:00
parent 597598fff4
commit d7f4830215
3 changed files with 18 additions and 25 deletions

View file

@ -294,7 +294,7 @@ in parentheses follows the development revision and the time stamp.")
("1.3.1" . "24.3")
("1.4.0" . "24.3")
("1.4.1" . "25.1")
("1.4.2" . "24.5")
("1.4.2" . "25.1")
("1.5.0" . "26.1")
("1.5.1" . "26.2")
("1.5.2" . "26.2")