aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1999-04-08 22:26:13 +0000
committerRichard M. Stallman1999-04-08 22:26:13 +0000
commitc352d9595152bb5682690a101ea294b7c5d4a8b4 (patch)
tree5c66249816f51c8eefc330dd78c9b3c99b7cc861
parent418cb80df259e83cd7b365eb71fbb9700c439a97 (diff)
downloademacs-c352d9595152bb5682690a101ea294b7c5d4a8b4.tar.gz
emacs-c352d9595152bb5682690a101ea294b7c5d4a8b4.zip
(jka-compr-insert-file-contents):
Use auto-coding-alist-lookup to check for files that should not have eol conversion, in the unibyte case.
-rw-r--r--lisp/jka-compr.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 02530bb441e..c01e4f4d4d5 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -522,7 +522,11 @@ There should be no more than seven characters after the final `/'."
522 ;; If multibyte characters are disabled, 522 ;; If multibyte characters are disabled,
523 ;; don't do that conversion. 523 ;; don't do that conversion.
524 (and (null enable-multibyte-characters) 524 (and (null enable-multibyte-characters)
525 'raw-text-unix) 525 (or (auto-coding-alist-lookup
526 (save-match-data
527 (string-match (jka-compr-info-regexp info) filename)
528 (substring filename 0 (match-beginning 0))))
529 'raw-text))
526 (let ((coding (find-operation-coding-system 530 (let ((coding (find-operation-coding-system
527 'insert-file-contents 531 'insert-file-contents
528 (jka-compr-byte-compiler-base-file-name file)))) 532 (jka-compr-byte-compiler-base-file-name file))))