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

3 files changed, 19 insertions, 9 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.
diff --git a/lispref/modes.texi b/lispref/modes.texi
index 56fb43a0c3b..6d9aabefbe8 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -956,7 +956,11 @@ Turning on Text mode runs the normal hook `text-mode-hook'."
 @end group
 @end smallexample
 
-  But here is how it was defined formerly, before
+@noindent
+(The last line is redundant nowadays, since @code{indent-relative} is
+the default value, and we'll delete it in a future version.)
+
+  Here is how it was defined formerly, before
 @code{define-derived-mode} existed:
 
 @smallexample
diff --git a/lispref/text.texi b/lispref/text.texi
index e5a7e73a528..8fb155d2109 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -1655,11 +1655,10 @@ they default to the whole buffer.
 @end defun
 
 @defun indent-to-left-margin
-This is the default @code{indent-line-function}, used in Fundamental
-mode, Text mode, etc.  Its effect is to adjust the indentation at the
-beginning of the current line to the value specified by the variable
-@code{left-margin}.  This may involve either inserting or deleting
-whitespace.
+This function adjusts the indentation at the beginning of the current
+line to the value specified by the variable @code{left-margin}.  (That
+may involve either inserting or deleting whitespace.)  This function
+is value of @code{indent-line-function} in Paragraph-Indent Text mode.
 @end defun
 
 @defvar left-margin
@@ -2199,9 +2198,7 @@ various commands) to indent the current line.  The command
 
 In Lisp mode, the value is the symbol @code{lisp-indent-line}; in C
 mode, @code{c-indent-line}; in Fortran mode, @code{fortran-indent-line}.
-In Fundamental mode, Text mode, and many other modes with no standard
-for indentation, the value is @code{indent-to-left-margin} (which is the
-default value).
+The default value is @code{indent-relative}.
 @end defvar
 
 @deffn Command indent-according-to-mode