*** empty log message ***

3 files changed, 47 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1fe801ac6d1..d3374dc7c73 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2003-01-13  Richard M. Stallman  <rms@gnu.org>
+
+        * 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  <storm@cua.dk>
 
         * ido.el (ido-enable-tramp-completion): New defcustom.
@@ -174,6 +191,8 @@
 
 2003-01-05  Richard M. Stallman  <rms@gnu.org>
 
+        * 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  <alexander.pohoyda@gmx.net>  (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  <mah@everybody.org>
 
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index e71cc84a86a..5eb19f363ac 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-13  Richard M. Stallman  <rms@gnu.org>
+
+        * text.texi (Changing Properties): Say string indices are origin-0.
+
+        * positions.texi (Screen Lines) <compute-motion>:
+        Correct order of elts in return value.
+
+        * keymaps.texi (Changing Key Bindings) <define-key>: Mention
+        how to define a default binding.
+
 2002-12-07  Markus Rost  <rost@math.ohio-state.edu>
 
         * loading.texi (Unloading): Fix recent change for load-history.
diff --git a/src/ChangeLog b/src/ChangeLog
index 7314d53fc30..ae00961f241 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2003-01-13  Richard M. Stallman  <rms@gnu.org>
+
+        * minibuf.c (minibuffer_completion_contents): 
+        Error if point is inside prompt.
+
+        * keyboard.c (command_loop_1): Don't redisplay directly
+        if there's a post-command-hook.
+
+        * fileio.c (syms_of_fileio) <directory-sep-char>: Doc fix.
+        (Fdo_auto_save): Add gcpros around Ffile_name_directory.
+
 2003-01-12  Kim F. Storm  <storm@cua.dk>
 
         * process.h (struct Lisp_Process): New member private_vars.