Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 14-15)

   - Update from CVS

2007-05-12  Richard M. Stallman  <rms@gnu.org>

   * etc/refcard.tex (section{Incremental Search}): Minor corrections.

2007-05-12  Richard M. Stallman  <rms@gnu.org>

   * lispref/text.texi (Margins): indent-to-left-margin is not the default.
   (Mode-Specific Indent): For indent-line-function, the default
   is indent-relative.

   * lispref/modes.texi (Example Major Modes): Explain last line of text-mode
   is redundant.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-746

1 files changed, 9 insertions, 0 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index cb824323286..1092346448e 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-12  Richard Stallman  <rms@gnu.org>
+
+        * text.texi (Margins): indent-to-left-margin is not the default.
+        (Mode-Specific Indent): For indent-line-function, the default
+        is indent-relative.
+
+        * modes.texi (Example Major Modes): Explain last line of text-mode
+        is redundant.
+
 2007-05-10  Richard Stallman  <rms@gnu.org>
 
         * keymaps.texi (Scanning Keymaps): Update where-is-internal example.