files.el doc fixes.

* lisp/files.el (auto-mode-alist, inhibit-first-line-modes-regexps)
(set-auto-mode): Doc fixes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efb428313e2f9706439143c8b92b6d05485394ab..6ada090d0717d3d64461106afb2faa9b2a3e0892 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-18  Glenn Morris  <rgm@gnu.org>
+
+       * files.el (auto-mode-alist, inhibit-first-line-modes-regexps)
+       (set-auto-mode): Doc fixes.
+
 2012-01-17  Glenn Morris  <rgm@gnu.org>
 
        * isearch.el (search-nonincremental-instead): Fix doc typo.

diff --git a/lisp/files.el b/lisp/files.el
index f15c523400dc74460106ce7f6182930e7e5d20d3..6056a70d4a1767827e9313ead70b30aaf4f41025 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2405,9 +2405,6 @@ If the element has the form (REGEXP FUNCTION NON-NIL), then after
 calling FUNCTION (if it's not nil), we delete the suffix that matched
 REGEXP and search the list again for another match.
 
-If the file name matches `inhibit-first-line-modes-regexps',
-then `auto-mode-alist' is not processed.
-
 The extensions whose FUNCTION is `archive-mode' should also
 appear in `auto-coding-alist' with `no-conversion' coding system.
 
@@ -2481,7 +2478,8 @@ See also `auto-mode-alist'.")
 (defvar inhibit-first-line-modes-regexps
   (mapcar 'purecopy '("\\.tar\\'" "\\.tgz\\'" "\\.tiff?\\'"
                      "\\.gif\\'" "\\.png\\'" "\\.jpe?g\\'"))
-  "List of regexps; if one matches a file name, don't look for `-*-'.")
+  "List of regexps; if one matches a file name, don't look for `-*-'.
+See also `inhibit-first-line-modes-suffixes'.")
 
 (defvar inhibit-first-line-modes-suffixes nil
   "List of regexps for what to ignore, for `inhibit-first-line-modes-regexps'.
@@ -2550,7 +2548,8 @@ Also applies to `magic-fallback-mode-alist'.")
 (defun set-auto-mode (&optional keep-mode-if-same)
   "Select major mode appropriate for current buffer.
 
-To find the right major mode, this function checks for a -*- mode tag,
+To find the right major mode, this function checks for a -*- mode tag
+\(unless `inhibit-first-line-modes-regexps' says not to),
 checks for a `mode:' entry in the Local Variables section of the file,
 checks if it uses an interpreter listed in `interpreter-mode-alist',
 matches the buffer beginning against `magic-mode-alist',