From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 20 Nov 2000 19:45:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.92~259
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=29a01b7231f39128e0702cc33deadf57fba964e9;p=emacs.git

*** empty log message ***
---

diff --git a/README b/README
index 2a89e61a663..3ad7700de44 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This directory tree holds version 21.0.90 of GNU Emacs, the extensible,
+This directory tree holds version 21.0.92 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 You 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 @@
 2000-11-20  Gerd Moellmann  <gerd@gnu.org>
 
+	* textmodes/artist.el (artist-mode): Fix autoload cookie.
+
 	* font-lock.el (java-keywords): Add MATCH-HIGHLIGHT part for
 	javadoc tags.
 	
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 @@
 
 ;;; Code:
 
-(defconst emacs-version "21.0.91" "\
+(defconst emacs-version "21.0.92" "\
 Version numbers of this version of Emacs.")
 
 (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 @@
 @ifnottex
 @c The edition number appears in several places in this file
 This is the fourteenth edition of the @cite{GNU Emacs Manual},
-updated for Emacs version 21.0.90.
+updated for Emacs version 21.0.92.
 @c Please REMEMBER to update edition number in *three* places in this file.
 
 @dircategory Emacs
@@ -52,7 +52,7 @@ Software Foundation raise funds for GNU development.''
 @sp 6
 @center @titlefont{GNU Emacs Manual}
 @sp 4
-@center Fourteenth Edition, Updated for Emacs Version 21.0.90.
+@center Fourteenth Edition, Updated for Emacs Version 21.0.92.
 @sp 5
 @center Richard Stallman
 @page
@@ -61,7 +61,7 @@ Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 199
    Free Software Foundation, Inc.
 @sp 2
 Fourteenth Edition @*
-Updated for Emacs Version 21.0.90, @*
+Updated for Emacs Version 21.0.92, @*
 August 2000
 
 ISBN 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 @@
 2000-11-20  Gerd Moellmann  <gerd@gnu.org>
 
+	* s/gnu-linux.h: Don't use `#cpu'.
+
 	* buffer.c (MAP_FAILED): Define it as `((void *) -1)' if it's
 	not defined in mman.h.