aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/jka-cmpr-hook.el
diff options
context:
space:
mode:
authorJoakim Verona2012-01-23 15:10:06 +0100
committerJoakim Verona2012-01-23 15:10:06 +0100
commit0322b140eead7c94de7f0f6d19a90bd15690b4eb (patch)
tree950c011783cc896d0450084cb5155e54548bfe5b /lisp/jka-cmpr-hook.el
parentd5114bfea3ea4c37c57e2af0f3b095be9fcd8bac (diff)
parentcb5850f27c1b4d26957d58e2da2314dd12498671 (diff)
downloademacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.tar.gz
emacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.zip
upstream
Diffstat (limited to 'lisp/jka-cmpr-hook.el')
-rw-r--r--lisp/jka-cmpr-hook.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index d09e64634c3..600ed549731 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -119,7 +119,7 @@ based on the filename itself and `jka-compr-compression-info-list'."
119(defun jka-compr-install () 119(defun jka-compr-install ()
120 "Install jka-compr. 120 "Install jka-compr.
121This adds entries to `file-name-handler-alist' and `auto-mode-alist' 121This adds entries to `file-name-handler-alist' and `auto-mode-alist'
122and `inhibit-first-line-modes-suffixes'." 122and `inhibit-local-variables-suffixes'."
123 123
124 (setq jka-compr-file-name-handler-entry 124 (setq jka-compr-file-name-handler-entry
125 (cons (jka-compr-build-file-regexp) 'jka-compr-handler)) 125 (cons (jka-compr-build-file-regexp) 'jka-compr-handler))
@@ -145,12 +145,12 @@ and `inhibit-first-line-modes-suffixes'."
145 ;; are chosen right according to the file names 145 ;; are chosen right according to the file names
146 ;; sans `.gz'. 146 ;; sans `.gz'.
147 (push (list (jka-compr-info-regexp x) nil 'jka-compr) auto-mode-alist) 147 (push (list (jka-compr-info-regexp x) nil 'jka-compr) auto-mode-alist)
148 ;; Also add these regexps to 148 ;; Also add these regexps to inhibit-local-variables-suffixes,
149 ;; inhibit-first-line-modes-suffixes, so that a 149 ;; so that a -*- line in the first file of a compressed tar file,
150 ;; -*- line in the first file of a compressed tar 150 ;; or a Local Variables section in a member file at the end of
151 ;; file doesn't override tar-mode. 151 ;; the tar file don't override tar-mode.
152 (push (jka-compr-info-regexp x) 152 (push (jka-compr-info-regexp x)
153 inhibit-first-line-modes-suffixes))) 153 inhibit-local-variables-suffixes)))
154 (setq auto-mode-alist 154 (setq auto-mode-alist
155 (append auto-mode-alist jka-compr-mode-alist-additions)) 155 (append auto-mode-alist jka-compr-mode-alist-additions))
156 156