From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 22 May 2007 11:42:31 +0000 (+0000)
Subject: (set-auto-mode): Doc fix.
X-Git-Tag: emacs-22.1~70
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c022c4c47e8c1ca9029cf6b48c6ff5daa392c9ce;p=emacs.git

(set-auto-mode): Doc fix.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24df5a7f982..d3a4af4db06 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-22  Richard Stallman  <rms@gnu.org>
+
+	* files.el (set-auto-mode): Doc fix.
+
 2007-05-22  Eli Zaretskii  <eliz@gnu.org>
 
 	* dos-w32.el (find-buffer-file-type-coding-system): Doc fix.
diff --git a/lisp/files.el b/lisp/files.el
index 322b28f293e..2dbc0c2791a 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2169,10 +2169,11 @@ Also applies to `magic-fallback-mode-alist'.")
 (defun set-auto-mode (&optional keep-mode-if-same)
   "Select major mode appropriate for current buffer.
 
-This checks for a -*- mode tag in the buffer's text, checks the
-interpreter that runs this file against `interpreter-mode-alist',
-compares the buffer beginning against `magic-mode-alist', or
-compares the filename against the entries in `auto-mode-alist'.
+To find the right major mode, this function checks for a -*- mode tag,
+checks if it uses an interpreter listed in `interpreter-mode-alist',
+matches the buffer beginning against `magic-mode-alist',
+compares the filename against the entries in `auto-mode-alist',
+then matches the buffer beginning against `magic-fallback-mode-alist'.
 
 It does not check for the `mode:' local variable in the
 Local Variables section of the file; for that, use `hack-local-variables'.
@@ -2181,7 +2182,8 @@ If `enable-local-variables' is nil, this function does not check for a
 -*- mode tag.
 
 If the optional argument KEEP-MODE-IF-SAME is non-nil, then we
-only set the major mode, if that would change it."
+set the major mode only if that would change it.  In other words
+we don't actually set it to the same mode the buffer already has."
   ;; Look for -*-MODENAME-*- or -*- ... mode: MODENAME; ... -*-
   (let (end done mode modes)
     ;; Find a -*- mode tag