(jka-compr-install): Add items to inhibit-first-line-modes-suffixes.

diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 94c5d7477048ca4bbe4c68413fe53469b7cda770..c6a3b97879b11150857665adc27e956844d202c5 100644 (file)
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -722,16 +722,23 @@ This adds entries to `file-name-handler-alist' and `auto-mode-alist'."
   (setq file-name-handler-alist (cons jka-compr-file-name-handler-entry
                                      file-name-handler-alist))
 
-  ;; Make entries in auto-mode-alist so that modes are chosen right
-  ;; according to the file names sans `.gz'.
   (mapcar
    (function (lambda (x)
-              (and
-               (jka-compr-info-strip-extension x)
-               (setq auto-mode-alist (cons (list (jka-compr-info-regexp x)
-                                                 nil 'jka-compr)
-                                           auto-mode-alist)))))
-
+              (and (jka-compr-info-strip-extension x)
+                   ;; Make entries in auto-mode-alist so that modes
+                   ;; are chosen right according to the file names
+                   ;; sans `.gz'.
+                   (setq auto-mode-alist
+                         (cons (list (jka-compr-info-regexp x)
+                                     nil 'jka-compr)
+                               auto-mode-alist))
+                   ;; Also add these regexps to
+                   ;; inhibit-first-line-modes-suffixes, so that a
+                   ;; -*- line in the first file of a compressed tar
+                   ;; file doesn't override tar-mode.
+                   (setq inhibit-first-line-modes-suffixes
+                         (cons (jka-compr-info-regexp x)
+                               inhibit-first-line-modes-suffixes)))))
    jka-compr-compression-info-list)
   (setq auto-mode-alist
        (append auto-mode-alist jka-compr-mode-alist-additions)))