From a267ab4da0c0cdc2e926abd29c00b6c2ba6399a1 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 13 May 2004 17:14:33 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 19 +++++++++++--------
 src/ChangeLog  | 13 ++++++++-----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bc828226d3..1d8ea16296e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* net/telnet.el (telnet-mode): Use define-derived-mode.
+	Don't modify the global value of comint-prompt-regexp.
+
 2004-05-13  John Paul Wallington  <jpw@gnu.org>
 
 	* version.el (emacs-version): Check for `gtk' feature before
@@ -12,8 +17,8 @@
 
 2004-05-13  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
-	* calendar/appt.el (appt-disp-window): Use
-	`calendar-set-mode-line' for a centered mode-line.
+	* calendar/appt.el (appt-disp-window):
+	Use `calendar-set-mode-line' for a centered mode-line.
 
 2004-05-13  Takaaki Ota  <Takaaki.Ota@am.sony.com>  (tiny change)
 
@@ -28,8 +33,8 @@
 
 2004-05-12  Daniel Pfeiffer  <occitan@esperanto.org>
 
-	* progmodes/compile.el (compilation-set-window-height): Use
-	save-excursion to protect against misplaced marker.
+	* progmodes/compile.el (compilation-set-window-height):
+	Use save-excursion to protect against misplaced marker.
 
 2004-05-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
@@ -57,8 +62,7 @@
 2004-05-11  Alexander Pohoyda  <alexander.pohoyda@gmx.net>  (tiny change)
 
 	* man.el (Man-getpage-in-background): Use shell-file-name
-	and shell-command-switch variables instead of hard-coded
-	values.
+	and shell-command-switch variables instead of hard-coded values.
 
 2004-05-11  Eli Zaretskii  <eliz@gnu.org>
 
@@ -66,8 +70,7 @@
 
 2004-05-11  Juanma Barranquero  <lektu@terra.es>
 
-	* custom.el (custom-initialize-default, defcustom): Fix typo
-	in docstring.
+	* custom.el (custom-initialize-default, defcustom): Typo in docstring.
 
 	* files.el (set-visited-file-name, file-expand-wildcards):
 	Fix docstring.
diff --git a/src/ChangeLog b/src/ChangeLog
index e891af0c8af..72bb1839049 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp.h (USE_LSB_TAG): Make it the default when it is known to work.
+
 2004-05-13  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
 	* window.c (Fdisplay_buffer, Fsplit_window)
@@ -25,12 +29,11 @@
 	(xpm_put_color_table_h, xpm_get_color_table_h)
 	(xpm_str_to_color_key, xpm_load_image, xpm_load)
 	(syms_of_image): Support XPM on Carbon Emacs.  Does not
-	depend on libXpm, but only supports XPM version 3 without
-	extensions.
+	depend on libXpm, but only supports XPM version 3 without extensions.
 
 2004-05-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-	* macterm.c (x_flush, XTframe_up_to_date): use FRAME_MAC_P
+	* macterm.c (x_flush, XTframe_up_to_date): Use FRAME_MAC_P
 	instead of FRAME_X_P
 
 2004-05-11  Kim F. Storm  <storm@cua.dk>
@@ -174,8 +177,8 @@
 
 2004-05-02  Eli Zaretskii  <eliz@gnu.org>
 
-	* syntax.h (SET_RAW_SYNTAX_ENTRY, SYNTAX_ENTRY_INT): Avoid
-	compiler warnings.
+	* syntax.h (SET_RAW_SYNTAX_ENTRY, SYNTAX_ENTRY_INT):
+	Avoid compiler warnings.
 
 	* Makefile.in (region-cache.o): Depend on config.h.
 
-- 
2.39.2