aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-11-20 19:45:48 +0000
committerGerd Moellmann2000-11-20 19:45:48 +0000
commit29a01b7231f39128e0702cc33deadf57fba964e9 (patch)
treecf344e5ac33e033465ccb51da360e2f0fd92a643
parenta8f77aaa34829ac461aca8c3715fa8fed5237d92 (diff)
downloademacs-29a01b7231f39128e0702cc33deadf57fba964e9.tar.gz
emacs-29a01b7231f39128e0702cc33deadf57fba964e9.zip
*** empty log message ***
-rw-r--r--README2
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/version.el2
-rw-r--r--man/emacs.texi6
-rw-r--r--src/ChangeLog2
5 files changed, 9 insertions, 5 deletions
diff --git a/README b/README
index 2a89e61a663..3ad7700de44 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
1This directory tree holds version 21.0.90 of GNU Emacs, the extensible, 1This directory tree holds version 21.0.92 of GNU Emacs, the extensible,
2customizable, self-documenting real-time display editor. 2customizable, self-documenting real-time display editor.
3 3
4You may encounter bugs in this release. If you do, please report 4You may encounter bugs in this release. If you do, please report
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 929be257503..1bbfe512907 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12000-11-20 Gerd Moellmann <gerd@gnu.org> 12000-11-20 Gerd Moellmann <gerd@gnu.org>
2 2
3 * textmodes/artist.el (artist-mode): Fix autoload cookie.
4
3 * font-lock.el (java-keywords): Add MATCH-HIGHLIGHT part for 5 * font-lock.el (java-keywords): Add MATCH-HIGHLIGHT part for
4 javadoc tags. 6 javadoc tags.
5 7
diff --git a/lisp/version.el b/lisp/version.el
index 786c6357f1b..1768f9e0a66 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -24,7 +24,7 @@
24 24
25;;; Code: 25;;; Code:
26 26
27(defconst emacs-version "21.0.91" "\ 27(defconst emacs-version "21.0.92" "\
28Version numbers of this version of Emacs.") 28Version numbers of this version of Emacs.")
29 29
30(defconst emacs-major-version 30(defconst emacs-major-version
diff --git a/man/emacs.texi b/man/emacs.texi
index 64a4684cc24..ef99a7015c4 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -8,7 +8,7 @@
8@ifnottex 8@ifnottex
9@c The edition number appears in several places in this file 9@c The edition number appears in several places in this file
10This is the fourteenth edition of the @cite{GNU Emacs Manual}, 10This is the fourteenth edition of the @cite{GNU Emacs Manual},
11updated for Emacs version 21.0.90. 11updated for Emacs version 21.0.92.
12@c Please REMEMBER to update edition number in *three* places in this file. 12@c Please REMEMBER to update edition number in *three* places in this file.
13 13
14@dircategory Emacs 14@dircategory Emacs
@@ -52,7 +52,7 @@ Software Foundation raise funds for GNU development.''
52@sp 6 52@sp 6
53@center @titlefont{GNU Emacs Manual} 53@center @titlefont{GNU Emacs Manual}
54@sp 4 54@sp 4
55@center Fourteenth Edition, Updated for Emacs Version 21.0.90. 55@center Fourteenth Edition, Updated for Emacs Version 21.0.92.
56@sp 5 56@sp 5
57@center Richard Stallman 57@center Richard Stallman
58@page 58@page
@@ -61,7 +61,7 @@ Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 199
61 Free Software Foundation, Inc. 61 Free Software Foundation, Inc.
62@sp 2 62@sp 2
63Fourteenth Edition @* 63Fourteenth Edition @*
64Updated for Emacs Version 21.0.90, @* 64Updated for Emacs Version 21.0.92, @*
65August 2000 65August 2000
66 66
67ISBN 1-882114-06-X 67ISBN 1-882114-06-X
diff --git a/src/ChangeLog b/src/ChangeLog
index 85ddee278ba..b4dd1f34fa5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12000-11-20 Gerd Moellmann <gerd@gnu.org> 12000-11-20 Gerd Moellmann <gerd@gnu.org>
2 2
3 * s/gnu-linux.h: Don't use `#cpu'.
4
3 * buffer.c (MAP_FAILED): Define it as `((void *) -1)' if it's 5 * buffer.c (MAP_FAILED): Define it as `((void *) -1)' if it's
4 not defined in mman.h. 6 not defined in mman.h.
5 7