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

8 files changed, 31 insertions, 18 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 7f73b904a63..d6584f61a9e 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -56,10 +56,10 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
 ** Takaaki.Ota@am.sony.com, May 2: table cell menu does not appear at the menubar
    Bug is intermittent.
 
-** Install python.el `with' patch from trunk.
-
 ** Install vc-hooks.el patch from trunk.
 
+** Move some items from magic-mode-alist to file-start-mode-alist.
+
 * DOCUMENTATION
 
 ** Check the Emacs Tutorial.
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 4ca7b612e75..c0f49d31429 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-12  Richard Stallman  <rms@gnu.org>
+
+        * refcard.tex (section{Incremental Search}): Minor corrections.
+
 2007-05-12  Micha,Ak(Bl Cadilhac  <michael@cadilhac.name>
 
         * Makefile (viperCard.ps, calccard.ps refcard.ps)
diff --git a/etc/NEWS b/etc/NEWS
index 87c42c01067..412f5bc928c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -357,7 +357,7 @@ in the value, use `$$'.
 
 ** The default values of paragraph-start and indent-line-function have
 been changed to reflect those used in Text mode rather than those used
-in Indented-Text mode.
+in Paragraph-Indent Text mode.
 
 ** The default for the paper size (variable ps-paper-type) is taken
 from the locale.
@@ -5015,7 +5015,7 @@ looking at the file contents.  It takes precedence over `auto-mode-alist'.
 
 *** New variable `file-start-mode-alist' determines major mode for a file by
 looking at the file contents.  It is handled after `auto-mode-alist',
-only if `auto-mode-alist' says nothing about the file.
+only if `auto-mode-alist' (and `magic-mode-alist') says nothing about the file.
 
 *** XML or SGML major mode is selected when file starts with an `<?xml'
 or `<!DOCTYPE' declaration.
diff --git a/etc/refcard.tex b/etc/refcard.tex
index 8c8d3288841..7f7784bc957 100644
--- a/etc/refcard.tex
+++ b/etc/refcard.tex
@@ -330,7 +330,7 @@ the directions.  If you are a first-time user, type \kbd{C-h t} for a
 \key{abort current search}{C-g}
 
 Use \kbd{C-s} or \kbd{C-r} again to repeat the search in either direction.
-If Emacs is still searching, \kbd{C-g} cancels only the part not done.
+If Emacs is still searching, \kbd{C-g} cancels only the part not matched.
 
 \shortcopyrightnotice
 
@@ -478,7 +478,7 @@ The following keys are defined in the minibuffer.
 \key{abort command}{C-g}
 
 Type \kbd{C-x ESC ESC} to edit and repeat the last command that used the
-minibuffer.  Type \kbd{F10} to activate the menu bar using the minibuffer.
+minibuffer.  Type \kbd{F10} to activate menu bar items on text terminals.
 
 \newcolumn
 \title{GNU Emacs Reference Card}
@@ -657,7 +657,7 @@ An example:
 
 \beginexample%
 (defun this-line-to-top-of-window (line)
-  "Reposition line point is on to top of window.
+  "Reposition current line to top of window.
 With ARG, put point on line ARG."
   (interactive "P")
   (recenter (if (null line)
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
diff --git a/src/ChangeLog b/src/ChangeLog
index b2e3338e98d..1fd66a4836b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,8 +2,7 @@
 
         * image.c (pbm_load): Correctly check image size for greyscale pbm.
 
-        * xterm.c (XTread_socket): Yet another uncaught X error
-        crash (YAUXEC).
+        * xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC).
 
 2007-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>