Fix commit conflicts.

[bpt/emacs.git] / man / ChangeLog

diff --git a/man/ChangeLog b/man/ChangeLog
index 81f1449..f0c5307 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,55 @@
+2005-01-13  Richard M. Stallman  <rms@gnu.org>
+
+       * commands.texi (Commands): Clarification.
+
+2005-01-11  Richard M. Stallman  <rms@gnu.org>
+
+       * programs.texi (Multi-line Indent): Fix previous change.
+       (Fortran Autofill): Simplify description of fortran-auto-fill-mode.
+
+2005-01-11  Kim F. Storm  <storm@cua.dk>
+
+       * widget.texi (Basic Types): Add :follow-link keyword.
+
+2005-01-09  Jay Belanger  <belanger@truman.edu>
+
+       * calc.texi (Basic Commands): Describe new behavior of calc-reset.
+
+2005-01-08  Richard M. Stallman  <rms@gnu.org>
+
+       * display.texi (Faces): isearch-lazy-highlight-face renamed to
+       lazy-highlight.
+
+       * search.texi (Query Replace): Mention faces query-replace
+       and lazy-highlight.
+       (Incremental Search): Update isearch highlighting info.
+
+2005-01-08  Jay Belanger  <belanger@truman.edu>
+
+       * calc.texi: Change throughout to reflect new default value of
+       calc-settings-file.
+
+2005-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * message.texi (Reply): `message-reply-to-function' should return
+       a list.  Suggested by ARISAWA Akihiro <ari@mbf.ocn.co.jp>.
+
+2005-01-06  Hiroshi Fujishima  <pooh@nature.tsukuba.ac.jp>  (tiny change)
+
+       * faq.texi (Changing load-path): Fix typo.
+
+2005-01-05  Jay Belanger  <belanger@truman.edu>
+
+       * calc.texi (Programming Tutorial): Replace kbd command by
+       appropriate characters for a keyboard macro.
+
+2005-01-04  Jay Belanger  <belanger@truman.edu>
+
+       * calc.texi (Basic Tutorial, Programming Tutorial): Remove caveats
+       for Lucid Emacs.
+       (Programming Tutorial): Mention that the user needs to be in the
+       right mode to compute some functions.
+
 2005-01-04  Richard M. Stallman  <rms@gnu.org>
 
        * custom.texi (Saving Customizations): Minor improvement.
@@ -65,10 +117,6 @@
        * basic.texi (Moving Point): C-e now runs move-end-of-line.
        (Undo): Doc undo-outer-limit.
 
-2004-12-11  Richard M. Stallman  <rms@gnu.org>
-
-       * Makefile.in (MAKEINFO): Add --force.
-
 2004-12-20  Jay Belanger  <belanger@truman.edu>
 
        * calc.texi (Types Tutorial): Emphasize that you can't divide by
@@ -94,7 +142,6 @@
        the standard "The GNU Emacs Manual" in fifth argument of @xref's.
        (Dealing with HTTP documents): @inforef->@xref.
 
->>>>>>> 1.412
 2004-12-15  Juri Linkov  <juri@jurta.org>
 
        * mark.texi (Transient Mark, Mark Ring): M-< and other
@@ -111,7 +158,6 @@
 
        * calc.texi: Fix some TeX definitions.
 
->>>>>>> 1.407
 2004-12-12  Juri Linkov  <juri@jurta.org>
 
        * misc.texi (FFAP): Add C-x C-r, C-x C-v, C-x C-d,
@@ -125,7 +171,6 @@
        * mark.texi (Marking Objects): Marking commands also extend the
        region when mark is active in Transient Mark mode.
 
->>>>>>> 1.403
 2004-12-09  Luc Teirlinck  <teirllm@auburn.edu>
 
        * reftex.texi (Imprint): Remove erroneous @value's.