*** empty log message ***

1 files changed, 26 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1fe801ac6d..d3374dc7c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2003-01-13  Richard M. Stallman  <[email protected]>
+
+	* apropos.el (apropos-documentation-property): New function.
+	(apropos): Use apropos-documentation-property.
+
+	* files.el (mode-line-process): Mark as risky.
+
+	* help.el (where-is): Catch errors in indirect-function.
+
+	* server.el (server-process-filter): Comment out -eval.
+	Don't switch buffers if inside isearch or minibuffer.
+
+	* progmodes/compile.el (compilation-revert-buffer):
+	If buffer has a file, revert it in the normal way.
+
+	* term/x-win.el: Require fontset conditionally again.
+
 2003-01-13  Kim F. Storm  <[email protected]>
 
 	* ido.el (ido-enable-tramp-completion): New defcustom.
@@ -174,6 +191,8 @@
 
 2003-01-05  Richard M. Stallman  <[email protected]>
 
+	* obsolete/uncompress.el: Display message that this package is obsolete.
+
 	* isearch.el (isearch-repeat): Error if try to repeat search and
 	there was no previous search.
 
@@ -191,9 +210,16 @@
 
 2003-01-05  Alexander Pohoyda  <[email protected]>  (tiny change)
 
+<<<<<<< ChangeLog
+	* mail/sendmail.el (mail-font-lock-keywords):
+	Match multiline In-Reply-To and X-*.
+	* mail/rmail.el (rmail-font-lock-keywords):
+	Match multiline In-Reply-To and X-*.
+=======
 	* mail/sendmail.el (mail-font-lock-keywords):
 	* mail/rmail.el (rmail-font-lock-keywords): Match multiline
 	In-Reply-To and X-*.
+>>>>>>> 1.4713
 
 2003-01-05  Mark A. Hershberger  <[email protected]>