diff options
| author | Paul Eggert | 2017-03-19 12:39:16 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-03-19 12:39:16 -0700 |
| commit | d7f4830215801c0c8d7fee0900ff99159b7a474d (patch) | |
| tree | ea0bff3b5f359ad9a3269625ec736545095eeb29 /lisp | |
| parent | 597598fff47f809c150e452d813c998b868376ec (diff) | |
| download | emacs-d7f4830215801c0c8d7fee0900ff99159b7a474d.tar.gz emacs-d7f4830215801c0c8d7fee0900ff99159b7a474d.zip | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/textmodes/rst.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 9143f97dce0..7fad83da6be 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el | |||
| @@ -294,7 +294,7 @@ in parentheses follows the development revision and the time stamp.") | |||
| 294 | ("1.3.1" . "24.3") | 294 | ("1.3.1" . "24.3") |
| 295 | ("1.4.0" . "24.3") | 295 | ("1.4.0" . "24.3") |
| 296 | ("1.4.1" . "25.1") | 296 | ("1.4.1" . "25.1") |
| 297 | ("1.4.2" . "24.5") | 297 | ("1.4.2" . "25.1") |
| 298 | ("1.5.0" . "26.1") | 298 | ("1.5.0" . "26.1") |
| 299 | ("1.5.1" . "26.2") | 299 | ("1.5.1" . "26.2") |
| 300 | ("1.5.2" . "26.2") | 300 | ("1.5.2" . "26.2") |