Merge from emacs--rel--22

Patches applied:

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

   - Update from CVS

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

3 files changed, 13 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d575e417465..f7e254153c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -22,6 +22,10 @@
         * progmodes/compile.el (compilation-handle-exit):
         `compilation-finish-function' may change the current buffer.
 
+2007-05-22  Richard Stallman  <rms@gnu.org>
+
+        * files.el (set-auto-mode): Doc fix.
+
 2007-05-22  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * help-fns.el (find-source-lisp-file): New function.
diff --git a/lisp/files.el b/lisp/files.el
index c0443005dc2..9ce1f0a0471 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2171,10 +2171,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'.
@@ -2183,7 +2184,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
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 5d5f13776a2..65e2b0f1c0b 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -747,8 +747,8 @@ appear on disk when you save the tar-file's buffer."
                              ;; find-buffer-file-type-coding-system
                              ;; (defined on dos-w32.el) to act as if
                              ;; the file being extracted existed, so
-                             ;; that the file's contents' encoding is
-                             ;; auto-detected.
+                             ;; that the file's contents' encoding and
+                             ;; EOL format are auto-detected.
                              (let ((file-name-handler-alist
                                     '(("" . tar-file-name-handler))))
                                (car (find-operation-coding-system