From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 2 Apr 1995 02:21:56 +0000 (+0000)
Subject: (jka-compr-install): Add items to inhibit-first-line-modes-suffixes.
X-Git-Tag: emacs-19.34~4679
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=469f4e8cfcea07d6a1fcd807e2d40dfc223c5e26;p=emacs.git

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

diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 94c5d747704..c6a3b97879b 100644
--- 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)))