From: Glenn Morris <rgm@gnu.org>
Date: Tue, 15 Jan 2008 03:54:28 +0000 (+0000)
Subject: Revert 2008-01-13 change: this is a generated file.
X-Git-Tag: emacs-pretest-23.0.90~8564
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9292328f935f06cdb014c572e9a7dd44875421a2;p=emacs.git

Revert 2008-01-13 change: this is a generated file.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d444bad5ed..2c215d57da0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-15  Glenn Morris  <rgm@gnu.org>
+
+	* diff-mode.el (diff-end-of-hunk): Revert 2008-01-08 change.
+
 2008-01-14  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-vars.el (c-constant-symbol): New function which
@@ -8,7 +12,7 @@
 
 	* progmodes/cc-vars.el (c-hanging-braces-alist): Remove the
 	obscure non-working fragment ":value c-".
-	
+
 2008-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* abbrev.el (clear-abbrev-table): Can't pass a symbol to intern.
diff --git a/src/ChangeLog b/src/ChangeLog
index 24dcaf9d9b4..001819a32a8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-15  Glenn Morris  <rgm@gnu.org>
+
+	* config.in: Revert 2008-01-13 change: this is a generated file.
+
 2008-01-13  Tom Tromey  <tromey@redhat.com>
 
 	* lisp.h: Fix typo.
diff --git a/src/config.in b/src/config.in
index 75a2058c41a..27f89c29b90 100644
--- a/src/config.in
+++ b/src/config.in
@@ -837,6 +837,13 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
+/* Define to 1 for Encore UMAX. */
+#undef UMAX
+
+/* Define to 1 for Encore UMAX 4.3 that has <inq_status/cpustats.h> instead of
+   <sys/cpustats.h>. */
+#undef UMAX4_3
+
 /* Define to the unexec source file name. */
 #undef UNEXEC_SRC