Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 18)

   - Update from CVS

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

   * lisp/buff-menu.el (Buffer-menu-sort-column): Doc fix.

2007-05-16  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/files.el (magic-mode-alist, magic-fallback-mode-alist):
   Move the *ml, Postscript, and XmCD entries to the fallback part.

   * lisp/files.el (magic-fallback-mode-alist):
   Rename from file-start-mode-alist.

2007-05-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>

   * src/macterm.c [USE_CARBON_EVENTS] (mac_convert_event_ref): Also convert
   dead key repeat and up events.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/lispref/modes.texi b/lispref/modes.texi
index 6d9aabefbe8..95fbe6a292f 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -616,7 +616,7 @@ the text at the beginning of the buffer matches @var{regexp} and
 @code{auto-mode-alist} gets to decide the mode.
 @end defvar
 
-@defvar file-start-mode-alist
+@defvar magic-fallback-mode-alist
 This works like @code{magic-mode-alist}, except that it is handled
 only if @code{auto-mode-alist} does not specify a mode for this file.
 @end defvar